tree f0d9177fd436246731fda429187ae3569f2af76f
parent 7cfd0bfe43c40c33159e105d4248105648b27491
parent 718af4ba737560744f5c48ea8e6192a02042d551
author Pavlin Radoslavov <pavlin@google.com> 1517008183 +0000
committer android-build-merger <android-build-merger@google.com> 1517008183 +0000

Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP" am: f9504d8979 am: 0859a07a61
am: 718af4ba73  -s ours

Change-Id: I77cf919485c824de5a64859ae13e88eeda8f9aad