commit | ee7d69415f31883c2ebcc89f150b3ab521ba5d06 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 01:39:14 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:39:14 2021 +0000 |
tree | ad6bd403f0864b34770463fef2b2246b4fb7acbe | |
parent | 84bf7efe65f35e737c8f9e75d3b1ca09ee98298a [diff] | |
parent | b566987209a453caa090cd8b84a7faffcd08c8eb [diff] |
[automerger skipped] Merge "Merge Android 12" am: 92da43cc21 -s ours am: b566987209 -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: Id0d4a399730b608b8b2eb979cfc0777669283336