| commit | cab8885192cd1169775621fff2812127f53bbaac | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 08:29:28 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:29:28 2021 +0000 |
| tree | 8fe876004afefcf0fdde357f19f17a89e41eb37c | |
| parent | 2489eb7de1daf0a5366a3562c5e6406ea963198c [diff] | |
| parent | f61161e53f8104561486b7fc8b937bed824e0ac7 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 92da43cc21 -s ours am: b566987209 -s ours am: ee7d69415f -s ours am: f61161e53f -s ours am skip reason: Merged-In I46d721193aaba14fb8028dbe4ebe25b5ddb999ee with SHA-1 04abbff9d0 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1847139 Change-Id: If84c53a9ac997d9a6be3a47f48d4765ab0904738