am a4e2911a: Merge "Allow BT inquiry while discovery is in progress." into mnc-dr-dev

* commit 'a4e2911a9fc8ae619665a54108141f09ed8272a4':
  Allow BT inquiry while discovery is in progress.
tree: 91a66315204253525bf114241e5d1e1c667a7388
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE