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

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