tree 3b7643306621b130f974cda6895cf664163297c4
parent 5ed9e7a4fde67f5f50e8681c3340c99263783196
parent 50f08db8a9100b79d7284406eaf2daae3af6a371
author Matthew Xie <mattx@google.com> 1382397064 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382397064 -0700

am 50f08db8: am 3755cde5: am dce8f102: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev

* commit '50f08db8a9100b79d7284406eaf2daae3af6a371':
  Change pairing api/intent permission from PRIVILEGED to ADMIN