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

* commit 'aeca185107481f28ad248c4f811bd708be8f5bff':
  Allow users to change the length of BT disoverability. DO NOT MERGE