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