tree edbdfe9f71b64f14afb9969c6e8cd6b5658fa836
parent 368cf66e2056db536c128880b29631e76d43fc6e
parent 239c7667dd71754029b27fdec7b63f7f8e15c86b
author Jason Monk <jmonk@google.com> 1418357541 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418357541 +0000

am 239c7667: am 7d8ccb41: Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev automerge: 70cf2f7

* commit '239c7667dd71754029b27fdec7b63f7f8e15c86b':
  Fix crash in BluetoothControllerImpl