Merge "Set BT to proper scan mode." into oc-mr1-dev am: 7989aeff66
am: 33c8e823a6

Change-Id: Id1f6af9ada7848b71a4b93456a33aeec5f12ada2
tree: 6d0beb5b970b8e8d843899d8f3c0c8c0807e0403
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml