tree 043e2c9e881c7c39079ec39736ae26847e86e1c0
parent 27ef6d45f490996cbfafa6b92a50760b7ac31c5a
parent dc3d2945337f2a81e989ea4fff682402bcbcf68f
author Xin Li <delphij@google.com> 1606970376 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606970376 +0000

[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 27a9b76aa2 -s ours am: dc3d294533 -s ours

am skip reason: Change-Id I62dd37dbbe959f869225f57dda0504fd31546e53 with SHA-1 c2510cab63 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/audio/+/13121833

Change-Id: Ib4dac23a5dfb7973344dcd31cd578522d5416b9a