tree eb027160c9f7045df8373e83181ef04f5ee0aa17
parent 8c737e7e65d701464d1685495e32807dda055402
parent f9838d0bb961d5464a92819107747237ea1d923c
author Matthew Xie <mattx@google.com> 1314122146 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1314122146 -0700

am f9838d0b: Merge "Set bluetooth discoverable off at power on time if the timeout is no forever"

* commit 'f9838d0bb961d5464a92819107747237ea1d923c':
  Set bluetooth discoverable off at power on time if the timeout is no forever