am b13c9bc5: manual merge

Merge commit 'b13c9bc5219ca85c36507fb3a8d5923e3de974b6'

* commit 'b13c9bc5219ca85c36507fb3a8d5923e3de974b6':
  BluetoothHeadset.java:
tree: a256638d3011fb38e1251c564b63883409a73bb6
  1. bridge/
  2. create/
  3. .gitignore
  4. Android.mk
  5. README