| commit | 9a53fbe44fcf4b3fe740e8b68ad16f2016aca62c | [log] [tgz] |
|---|---|---|
| author | Matthew Xie <mattx@google.com> | Mon Oct 21 16:05:26 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 21 16:05:26 2013 -0700 |
| tree | 120bd711eaadb693ac7cb3b6f76897ff253374ac | |
| parent | 3e33d5a769885dcd7f19f386f165810881e22c16 [diff] | |
| parent | ce39e8ced8bcbc6663d420bea66280f8b438e027 [diff] |
am ce39e8ce: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev * commit 'ce39e8ced8bcbc6663d420bea66280f8b438e027': Change pairing api/intent permission from PRIVILEGED to ADMIN