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