| commit | 1221851565eb41ff4cb1741b77bf099289e027b9 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Fri Apr 02 22:57:16 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 02 22:57:16 2021 +0000 |
| tree | bd407ff5ab761d16a04f2786be22c01a0d0f0294 | |
| parent | 7c913b2aac9d2073542f6cbf7bce7869b768b5d6 [diff] | |
| parent | a655b52dc30fa79aeb25dcb86c28a67e9f7ff42e [diff] |
[automerger skipped] Noop mediaresourcemanager change to avoid conflict am: eb009aafc4 am: c92a697f01 am: a655b52dc3 -s ours am skip reason: skip tag Change-Id I943317f71ea43470d86c5e0ea5b703d23f08a678 with SHA-1 c7303e8842 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1662927 Change-Id: I23013f9597a805a5fd5b81faf34f7bb41122272a