am aeca1851: (-s ours) am c955d8ee: Merge "Allow users to change the length of...
am aeca1851: (-s ours) am c955d8ee: Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread
* commit 'aeca1851':
Allow users to change the length of BT disoverability. DO NOT MERGE