tree a752fc87449886adddcbd5723a0d741b5bfe01a7
parent 82a551c51558222a912c1a118eb98bc2c8c5afc1
parent 02daba1e72c35fd998fd0fda3fbecb6a1dc543a7
author Marie Janssen <jamuraa@google.com> 1482172042 +0000
committer android-build-merger <android-build-merger@google.com> 1482172042 +0000

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

Change-Id: I9a866a2249a51f074c87c194df8ed0df2f34801b