diff options
author | Andy Hung <hunga@google.com> | 2021-04-23 21:03:57 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-23 21:03:57 +0000 |
commit | 8479536f6e8e63af40011ac209e53d2793148cf9 (patch) | |
tree | 21038e6f0407a532baf64412b3f3a376659ee9f0 /libs/hwui/renderthread/DrawFrameTask.cpp | |
parent | 62786b654571d46d0ea77650cc57665c21e8308c (diff) | |
parent | 6698967429ece2a0ba679ad51746f2ba89b7a4e9 (diff) |
[automerger skipped] Merge "MediaFormat: new MIME types for MPEG-H audio" am: fae80ba7a4 am: 3eb382c3da am: 6698967429 -s ours
am skip reason: skip tag Change-Id I6b0026e6b5b979b6c3e3ca0b1c675e890662c0df with SHA-1 bb9e2099fe is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682765
Change-Id: I6b641981835bc6111c14c6dc992b9d1399c728e7
Diffstat (limited to 'libs/hwui/renderthread/DrawFrameTask.cpp')
0 files changed, 0 insertions, 0 deletions