tree dadfc86bfa53774b630b40abab7d7f8eeaf7f99a
parent bd2c15386ecb0be826ac52400c357d4043c4f091
parent da86112baea3e27f5bfdee6c0732b0a6d476ff0e
author TreeHugger Robot <treehugger-gerrit@google.com> 1608217000 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608217000 +0000

[automerger skipped] Merge "Log MediaExtractor entry point to MediaMetrics" into rvc-qpr-dev am: cf7f406c2d -s ours am: da86112bae -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: Ie7e5948712a63e1c436d8e201d8978ce3b1e3d41