tree 2852a5e9962b7aef939305f211f7dbb259a8ec89
parent f1b6e8e1a7984223063b17fcb72bc88b180f4bb7
parent 4d701d01013fefa56187e8b20f9ee79c94a72014
author Zongheng Wang <wangzongheng@google.com> 1575325667 -0800
committer android-build-merger <android-build-merger@google.com> 1575325667 -0800

[automerger skipped] Merge "Move Bluetooth specfic APIs called in Settings to BT DatabaseManager" am: 3908351777 am: 6b30bf8a7f
am: 4d701d0101 -s ours
am skip reason: change_id I89b0ab44920b1deefe7523e5f19ed1c799c4c658 with SHA1 eadcbd8f8a is in history

Change-Id: Ia0da7f7cf2abdfc7ba267d9cee1501eacd44f7bb