tree d5eb587444a1b4b386a0b9cae2fb2d264f333c38
parent 120cb677f0229216876e4b02752fff147f1dc96e
parent c15cc348e8c7a05ad46fc0c143391bae76bba388
author Pavlin Radoslavov <pavlin@google.com> 1479366973 +0000
committer android-build-merger <android-build-merger@google.com> 1479366973 +0000

Merge "Don't disconnect an A2DP device when connecting to same device" am: 3ebcf1218b
am: c15cc348e8

Change-Id: I0754321d2e289b4c6d2d64a00d13a2d9c2bfcf1c