Merge "Allow BT inquiry while discovery is in progress." into mnc-dr-dev
tree: 1c5ed120a444821cd39c9bc99beddfa4ad7b4981
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE