tree 9a9b63fd809a925018ceb9f30374370d006424ba
parent bd7fab30dc5cd5fee3f50980e9cea90442199e63
parent ff0d3e1c8dce08373a42bf89ee9b781ef41cab3f
author Marie Janssen <jamuraa@google.com> 1482020418 +0000
committer android-build-merger <android-build-merger@google.com> 1482020418 +0000

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

Change-Id: I5e891c190c1c86d33176f83a2e92ce807af45472