tree 567182f0fa3e6b69e359ab7ca18a17d22c35e4a9
parent c074fe9dc7a12a004914cc6065584ccb3be5b78f
parent cf7f406c2db5edda6bb030d2d2d9fd31bff84c89
author TreeHugger Robot <treehugger-gerrit@google.com> 1608215659 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608215659 +0000

[automerger skipped] Merge "Log MediaExtractor entry point to MediaMetrics" into rvc-qpr-dev am: cf7f406c2d -s ours

am skip reason: Change-Id I648e27b1b483a646df77e2a88ec5ac8af01a0bb9 with SHA-1 1349f47fdb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c8894a89d33b13f5ab37cbdf63f48202b0413b6