tree f0793e8b9dca6f0aef67cb2cb3a091cf60f04774
parent 311fd8bf28c1c16c4da81485b26518c8df97f50b
parent 810c49b2cfece1c48ced464d6bd2509ec4cac7a3
author Matthew Xie <mattx@google.com> 1382396345 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1382396346 +0000

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