tree 577df8560207c329aedd9dcadf7dcfba17c9a62e
parent f261d51b07a43eade5748f0f15cd23a8848bb40c
parent fc923fb8562dc7a7c39719b89072aaf4db2ef61a
author Xin Li <delphij@google.com> 1602213778 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602213778 +0000

[automerger skipped] Skip ab/6749736 in stage. am: fc923fb856 -s ours

am skip reason: Change-Id I87e55fdfeb997f036bcc45d5ae1a1bfb4428471d with SHA-1 ddb78f5eed is in history

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

Change-Id: I90c51af1f5e66bc5917b2b25899456c91b3ff4d5