Commit 3d854f4f authored Oct 27, 2020 by Santiago Seifert Committed by Automerger Merge Worker Oct 27, 2020

[automerger skipped] Allow MediaMetrics entries from MediaParser am: 0edbb914 -s ours

am skip reason: Change-Id Icca73a9396195d8cf299eb03bc778a032aacc364 with SHA-1 49fb4521 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12930519

Change-Id: I5774486933f6dc0562c98f9b175056d141b6c5c3

There are no changes