Merge "Use new BluetoothUuid constants" am: eb518df759 am: 95b27f97cd
am: 22449e38b3

Change-Id: I563aedffaa20e1113627be60e911cc4500a44a2c
tree: 06ab0c8dd6ab946b775759d13006ef438d127caa
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg