tree 78ceaee4e6025ac15a031695cbcf6e8735bfe10e
parent 0f6f21026451f516a0179ae4f13bcdfcb0fd19a9
parent 1b3a4362a08d816d78fdbb04ef115b31c8674420
author Martijn Coenen <maco@google.com> 1354302845 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354302845 -0800

am 1b3a4362: am f77445cd: am b1a01ab0: Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev

* commit '1b3a4362a08d816d78fdbb04ef115b31c8674420':
  Allow the NFC process to call Bluetooth APIs.