| commit | 3755cde5fd20306f3965e7b317e3763640b11b42 | [log] [tgz] |
|---|---|---|
| author | Matthew Xie <mattx@google.com> | Mon Oct 21 16:05:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 21 16:05:23 2013 -0700 |
| tree | f0793e8b9dca6f0aef67cb2cb3a091cf60f04774 | |
| parent | a58a4068a42d9b705a2501559c0e8600306ad573 [diff] | |
| parent | dce8f102f76aeea3356c5416b8ebb5e5c8b5cb22 [diff] |
am dce8f102: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev * commit 'dce8f102f76aeea3356c5416b8ebb5e5c8b5cb22': Change pairing api/intent permission from PRIVILEGED to ADMIN