tree df6e20f436c4734de7e743dbedbbecb9f287a67d
parent cac8662943b28663fefc6e5315a7b9acd514bfdb
parent 7d8ccb41fa3756839597cd28cd5710c1b690e17f
author Jason Monk <jmonk@google.com> 1418326108 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418326108 +0000

am 7d8ccb41: Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev

* commit '7d8ccb41fa3756839597cd28cd5710c1b690e17f':
  Fix crash in BluetoothControllerImpl