OSDN Git Service

am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server"
authorJaikumar Ganesh <jaikumarg@android.com>
Mon, 6 Jun 2011 18:34:11 +0000 (11:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Jun 2011 18:34:11 +0000 (11:34 -0700)
commit5aaed0970be451479a07b2423e709026dec6611b
treed71c309c5a7a61feb7b44f538af538d6fc9f04a2
parent59242cf65ec775ccb6cb3639df4eab6af09f3108
parent58ada2f3bbab749fb5a813fb8f82eee347080405
am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server"

* commit '58ada2f3bbab749fb5a813fb8f82eee347080405':
  Require bonding and encryption for PBAP server
core/java/android/bluetooth/BluetoothAdapter.java