commit | ce39e8ced8bcbc6663d420bea66280f8b438e027 | [log] [tgz] |
---|---|---|
author | Matthew Xie <mattx@google.com> | Mon Oct 21 22:58:53 2013 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 21 22:58:53 2013 +0000 |
tree | 7bd7ed05de971b82e74bb7c443edfcf95d183bbd | |
parent | 8d51c2f6fa628cc8f3e4d182df2dafdb7cbea48c [diff] | |
parent | ac2c6c3a16a69053596b350e94fee52ce85eeacf [diff] |
Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev