tree d3ab7b42eae95f1b0ea7b186adf4a1def484babf
parent 3b7791c73e941b39764dab810136a6b882401c62
parent 04b363802f30fa2f5f0f239175248926b814fd61
author Jaikumar Ganesh <jaikumarg@android.com> 1310577927 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1310577927 -0700

am 9ff89495: am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery"

* commit '9ff89495a4890191a0bc5dfddf28f23f79f23698':
  Bluetooth: correcting return value from cancelDiscovery