commit | 4494cbd680bd68f60fbec8673dcc7d895e6a708e | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Mar 03 23:37:07 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 03 23:37:07 2021 +0000 |
tree | 55169f5093bff8649511ef3d1b37cfb121896e57 | |
parent | 80e5a4c67caac674c33040a4038b5129af6457e5 [diff] | |
parent | 7d18d2815ab1ebee36cb9c850bc83c21b52dfd0a [diff] |
[automerger skipped] Merge "Merge RQ2A.210305.007" am: 726677e6cc -s ours am: 7d18d2815a -s ours am skip reason: Change-Id Ib1d821a873e8aa0a2251792842de9b57cd80d87e with SHA-1 74ba7b8435 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1613213 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifa6951c033669abfca41e60c75415f5665f0676e