tree 721883af680457a27b94200e804483032fa288ec
parent 21014b81be8d3ba936a668b05823303460c7f20b
parent 7fd7bc57ee9130a6f9997c746af631c60370c001
author Marie Janssen <jamuraa@google.com> 1482020682 +0000
committer android-build-merger <android-build-merger@google.com> 1482020682 +0000

Merge "Bluetooth: fix issues re-enabling after crash" am: e2c22e38d5 am: ff0d3e1c8d  -s ours
am: 7fd7bc57ee

Change-Id: I711edb691cd0cbbd4c5f52d4ebdc27fd7adb2d26