OSDN Git Service

am e1beca8b: am 20a1555a: Allow BT inquiry while discovery is in progress.
authortturney <tturney@google.com>
Mon, 19 Oct 2015 19:14:08 +0000 (19:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Oct 2015 19:14:08 +0000 (19:14 +0000)
* commit 'e1beca8bbcfcfba2bf6ab46627a439ff95cdb0fa':
  Allow BT inquiry while discovery is in progress.


Trivial merge