OSDN Git Service

am 6b728e41: Merge "Interleave br/edr device discovery with BLE device scan for some...
authorMatthew Xie <mattx@google.com>
Wed, 9 Oct 2013 23:47:45 +0000 (16:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Oct 2013 23:47:45 +0000 (16:47 -0700)
* commit '6b728e412c22549ef51c19315ccf9ab3b7e16885':
  Interleave br/edr device discovery with BLE device scan for some targets


Trivial merge