| commit | 07c4d74cdf28da0af7d274125b4980599668996f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Dec 14 21:51:14 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 14 21:51:14 2021 +0000 |
| tree | 5b524ffb9901ec1319df2fa5e72020eeb882dfe9 | |
| parent | 5cb1927a0322ec60cc97ad3d52c10939bc56f828 [diff] | |
| parent | d6c41481edd3707fbbca4a87b849f1c0468964da [diff] |
[automerger skipped] Merge "Merge Android 12 QPR1" am: b6838ad8ad -s ours am: 1bb0d68795 -s ours am: d6c41481ed -s ours am skip reason: Merged-In I335749953fc8b0200708ea59dcc328531d09017f with SHA-1 8ca1bd9157 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1921806 Change-Id: Idc8da3b8baecc7cfeccd2b393eca8b3804550fc4