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