tree 23ad3fafb2e981409d35bc26eaf8275fad8ca7b4
parent 23a70868acd01fa6beacbf2b0f191dc9d1f2668e
parent 02f17898ee7e751916438f8fee7fe48ccb213f57
author Xin Li <delphij@google.com> 1607572020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607572020 +0000

[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: cc565d9013 -s ours am: 02f17898ee -s ours

am skip reason: Change-Id I0d3037d036bf34db403accd5f296df5381c4ec34 with SHA-1 beeebec34d is in history

Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/1521220

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia94fcf5f05bee4e6d5827ae705bdac8260fc69ad