OSDN Git Service

Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev
authorMartijn Coenen <maco@google.com>
Fri, 30 Nov 2012 19:07:53 +0000 (11:07 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 30 Nov 2012 19:08:07 +0000 (11:08 -0800)
commitb1a01ab01c2aa5136f7781c3a6ec682590e38ac4
tree5fc8dab3a8c1d3ca81542e21dda492af08c7d1a5
parent675814d488579582e0214cc720d9ccc310173f25
parent8385c5afbd92da5f2e8bc13d153114bc3a7cb0f5
Merge "Allow the NFC process to call Bluetooth APIs." into jb-mr1.1-dev
services/java/com/android/server/BluetoothManagerService.java