| commit | 9ef71f09edc5de7c882f5ddd3e716ed2c2448149 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Dec 14 22:19:36 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 14 22:19:36 2021 +0000 |
| tree | 5c3f5057c4f0cf6971075bf7312db5968fea5eb8 | |
| parent | 9c6496c2b1b366cfe3286a7e28aa9d8b6a3bc8c3 [diff] | |
| parent | 07c4d74cdf28da0af7d274125b4980599668996f [diff] |
[automerger skipped] Merge "Merge Android 12 QPR1" am: b6838ad8ad -s ours am: 1bb0d68795 -s ours am: d6c41481ed -s ours am: 07c4d74cdf -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: I423b156f8916242185c5ae62e78244690870d997