| commit | 80acb20ca95da161fc739abac0fb9084a76e2ced | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Mon Mar 17 19:52:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 17 19:52:35 2014 +0000 |
| tree | ebfbd5e5d1cc4e4e09f09e49eacc26f12b48b423 | |
| parent | aa89a914825a79e535917c2f0da6cad1d1ed9f2d [diff] | |
| parent | 7cd122a549831611ce79389e481484ade16744f1 [diff] |
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