OSDN Git Service

resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp
authorJaikumar Ganesh <jaikumar@google.com>
Wed, 13 Jul 2011 19:29:57 +0000 (12:29 -0700)
committerJaikumar Ganesh <jaikumar@google.com>
Wed, 13 Jul 2011 19:29:57 +0000 (12:29 -0700)
commit6dd4531639157191e6224d3f8af5c9d099ca945f
tree4d1ec866d2330c7d20216cc36c90076a3c68900b
parent28d92afc0a17cbf9149a0c8be9c8795d6f3306a5
parentab3ec17608fd17b48ae3a4b7359f5a150da3cf7e
resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp

Change-Id: I75fcd15f85f2cb3912ada1df453fb02bd13e5d85
core/java/android/bluetooth/BluetoothAdapter.java
core/jni/android_server_BluetoothService.cpp
core/tests/coretests/src/android/bluetooth/BluetoothTestUtils.java