Merge change I428bc0fc into eclair

* changes:
  Remove STOPSHIP BT logging.
tree: c19b346485a3cdbc3bc8d7f87e077f3f434bf327
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. AndroidManifest_test.xml