| commit | d6c41481edd3707fbbca4a87b849f1c0468964da | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Dec 14 21:24:27 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 14 21:24:27 2021 +0000 |
| tree | e60124ec44d85f597113d4800c5983a049810ccc | |
| parent | 4f0ac606e993cefb1d1520479f4b882f4b417546 [diff] | |
| parent | 1bb0d687956b8c9c4c4caea427617d994b5361eb [diff] |
[automerger skipped] Merge "Merge Android 12 QPR1" am: b6838ad8ad -s ours am: 1bb0d68795 -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: If806dee43cba9cee2bb7e93d168215227a6c3551