tree 3b3ace12db0033607cdf3324f4c1558e3505e4a7
parent 468d8e28d50fbb3a5ea9fc9df0aad7178e7c42bd
parent 6783b807d62fd159cd94db8732e12225d5b07a3e
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> 1593545958 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593545958 +0000

[automerger skipped] Check data consistency in mdls parsing am: e689e94f3b am: 0a3c762015 am: 2ecaa02926 am: 4a995822bc am: 80a0344555 am: b9ee07c0cb -s ours am: 6cfd74943d -s ours am: 6783b807d6 -s ours

am skip reason: Change-Id I6f3098b029b6da56415a588882a5bb908edd3db7 with SHA-1 c049c140e3 is in history

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

Change-Id: I87e55fdfeb997f036bcc45d5ae1a1bfb4428471d