tree ebfbd5e5d1cc4e4e09f09e49eacc26f12b48b423
parent aa89a914825a79e535917c2f0da6cad1d1ed9f2d
parent 7cd122a549831611ce79389e481484ade16744f1
author Adam Lesinski <adamlesinski@google.com> 1395085955 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395085955 +0000

am 7cd122a5: Merge "Add device admin to wearables for API8 Compat" into klp-modular-dev

* commit '7cd122a549831611ce79389e481484ade16744f1':
  Add device admin to wearables for API8 Compat