| commit | dce8f102f76aeea3356c5416b8ebb5e5c8b5cb22 | [log] [tgz] |
|---|---|---|
| author | Matthew Xie <mattx@google.com> | Mon Oct 21 22:59:05 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 21 22:59:06 2013 +0000 |
| tree | f0793e8b9dca6f0aef67cb2cb3a091cf60f04774 | |
| parent | 311fd8bf28c1c16c4da81485b26518c8df97f50b [diff] | |
| parent | 810c49b2cfece1c48ced464d6bd2509ec4cac7a3 [diff] |
Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev