tree 6d0189f1e4cd2a7654dec68c963e5433509aa88b
parent f26040f05aa54177c6d60df5e45dd2b13cf4388f
parent b394253a3f86df065783d5c07250c155428702e5
author Dan Sandler <dsandler@android.com> 1418238911 +0000
committer android-build-merger <android-build-merger@google.com> 1418238911 +0000

am 35850627: Merge "BluetoothControllerImpl: track bluetooth better" into lmp-mr1-dev
automerge: b394253

* commit 'b394253a3f86df065783d5c07250c155428702e5':
  BluetoothControllerImpl: track bluetooth better