tree c149316cecb4979e3050026e8ede3eb349ecb032
parent 10c9b6d19cf47a84e414723435a5ea82e2ea14aa
parent a7e508eb55c8f63ff43aea2374a2773893e69321
author Nick Pelly <npelly@google.com> 1253902577 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253902577 -0700

am a7e508eb: am 18b1e79a: Bluetooth API: Do not allow apps to programmatically make BT discoverable.

Merge commit 'a7e508eb55c8f63ff43aea2374a2773893e69321'

* commit 'a7e508eb55c8f63ff43aea2374a2773893e69321':
  Bluetooth API: Do not allow apps to programmatically make BT discoverable.