OSDN Git Service

am eeb7803a: (-s ours) am aeca1851: (-s ours) am c955d8ee: Merge "Allow users to...
authorJaikumar Ganesh <jaikumar@google.com>
Wed, 8 Jun 2011 00:53:26 +0000 (17:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Jun 2011 00:53:26 +0000 (17:53 -0700)
* commit 'eeb7803a9545e5574ef70831285f5121fe68a564':
  Allow users to change the length of BT disoverability. DO NOT MERGE


Trivial merge