tree e8b2108d319c1afd6f80092850457d40c8c9d75f
parent ff3a8bf0f78b91491601f4a4db5c7825346aeb90
parent e5688052098f96e91feb1c6b9242153f15ca586f
author Eric Laurent <elaurent@google.com> 1539735093 -0700
committer android-build-merger <android-build-merger@google.com> 1539735093 -0700

[automerger skipped] Merge "audioservice: fix a2dp connection race condition"
am: e568805209  -s ours

Change-Id: Ifbb5cc5a8422f73e2f2eb2236d3f2865e4553986