tree 4a96c858942f575cd4e281c6eb081a5bb084590f
parent 0c5f3638114bb9b6ed78c251f59934d2250dece8
parent 028ce0135473c0d2c6537a82eaa5ad607758939c
author Myles Watson <mylesgw@google.com> 1487038723 +0000
committer android-build-merger <android-build-merger@google.com> 1487038723 +0000

Merge "Bluetooth: Add CHECK and move ASSERT" am: b835ea3f11
am: 028ce01354

Change-Id: Ia432ecc1676f926a157eb6b978990c19814f2aa4