am d7030e55: am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code."

author Jaikumar Ganesh <jaikumarg@android.com>

Fri, 20 May 2011 21:52:27 +0000 (14:52 -0700)

committer Android Git Automerger <android-git-automerger@android.com>

Fri, 20 May 2011 21:52:27 +0000 (14:52 -0700)
author Jaikumar Ganesh <jaikumarg@android.com>
Fri, 20 May 2011 21:52:27 +0000 (14:52 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 20 May 2011 21:52:27 +0000 (14:52 -0700)
diff --cc core/java/android/server/BluetoothService.java

index f98d275,6144766..b3cbf50

mode 100644,100755..100755
--- 1/core/java/android/server/BluetoothService.java
--- 2/core/java/android/server/BluetoothService.java
+++ b/core/java/android/server/BluetoothService.java
author	Jaikumar Ganesh <jaikumarg@android.com>
	Fri, 20 May 2011 21:52:27 +0000 (14:52 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 20 May 2011 21:52:27 +0000 (14:52 -0700)