commit | c15fec9bb98b7f18db2047bab5aeda33ed084b5f | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Mar 08 10:19:13 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 08 10:19:13 2022 +0000 |
tree | 8a71b0b71723f6cb79bc7eeabe1d55252bbf9a06 | |
parent | ccb3f81f72e2a6ee58052031b867a96c7a84dfc9 [diff] | |
parent | 94ce1fc5ca987bb87c8d1cedaa172d471425af4a [diff] |
[automerger skipped] Merge Android 12L am: 94ce1fc5ca -s ours am skip reason: Merged-In I968601ea0aef02f03ecfc0d09049efb13ecda483 with SHA-1 ccb3f81f72 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2013182 Change-Id: I034c722d4228d657d6a49288f440d0fa6e832c69