tree 0f211f91aa71600440fd4837b5c11122e321c20e
parent bde007c7f0eff9eabee68e7819d0a8c9ae844285
parent de49eecf02f552df911bccc2f553e08e0bf4d212
author Robert Lee <lerobert@google.com> 1557961664 -0700
committer android-build-merger <android-build-merger@google.com> 1557961664 -0700

Merge "audio: fix resume music not smooth after press end call with touch sound" into qt-dev
am: de49eecf02

Change-Id: I6813b53e094d15b4a1df954593d3a49470cf7030