tree f60922573c63ecc567b21c8292a6e54669920bc5
parent 07dee169f4efe8f5ab10a39ebf5a41563322cecd
parent 0a4e2245263c594d85f7579c970c926c50bc1ede
author Mike Lockwood <lockwood@google.com> 1413227199 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413227199 +0000

am 0a4e2245: am 8ca4886e: am 317f9ce8: Merge "Change RECEIVE_BLUETOOTH_MAP permission to signature or system" into lmp-dev

* commit '0a4e2245263c594d85f7579c970c926c50bc1ede':
  Change RECEIVE_BLUETOOTH_MAP permission to signature or system