tree 7bd7ed05de971b82e74bb7c443edfcf95d183bbd
parent 8d51c2f6fa628cc8f3e4d182df2dafdb7cbea48c
parent ac2c6c3a16a69053596b350e94fee52ce85eeacf
author Matthew Xie <mattx@google.com> 1382396333 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1382396333 +0000

Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev