tree 93cf79276706fd044fdc2cb68653be29586fe66c
parent 3ff1139032b0d63522b627ccf69fdd0832a6da47
parent 5cb09b7dc5b2a3bfa895bca5402af9edc8ec9d9a
author Matthew Xie <mattx@google.com> 1354649393 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354649393 -0800

am 5cb09b7d: am 8b283df9: am b6b4f171: Merge "Change getName and getAddress permission to BLUETOOTH" into jb-mr1.1-dev

* commit '5cb09b7dc5b2a3bfa895bca5402af9edc8ec9d9a':
  Change getName and getAddress permission to BLUETOOTH