am c955d8ee: Merge "Allow users to change the length of BT disoverability. DO...
am c955d8ee: Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread
* commit 'c955d8ee':
Allow users to change the length of BT disoverability. DO NOT MERGE