| commit | 20dba7e3abb355320a4d2fa3708b693330bb19ac | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Mon Mar 17 23:32:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 17 23:32:28 2014 +0000 |
| tree | cffb068b804cf2b84073a0597b3af2faadf78bc1 | |
| parent | 28cd297db6f28f12ad6e8f152610ada2d6b2c379 [diff] | |
| parent | 80acb20ca95da161fc739abac0fb9084a76e2ced [diff] |
am 80acb20c: am 7cd122a5: Merge "Add device admin to wearables for API8 Compat" into klp-modular-dev * commit '80acb20ca95da161fc739abac0fb9084a76e2ced': Add device admin to wearables for API8 Compat