am 37940170: (-s ours) am bd34e568: (-s ours) am eddb21a2: Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread

* commit '37940170d00130d55d379178413f115b3feb59c4':
  Changes for API of Bluetooth Discoverability. DO NOT MERGE