| commit | f61161e53f8104561486b7fc8b937bed824e0ac7 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 07:56:29 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 07:56:29 2021 +0000 |
| tree | 5063a912e67485796bf8d495a7826999798ac63c | |
| parent | 03cb33b5c88e2bc2475c3ed6df4b3efffbb4b36b [diff] | |
| parent | ee7d69415f31883c2ebcc89f150b3ab521ba5d06 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 92da43cc21 -s ours am: b566987209 -s ours am: ee7d69415f -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: I46f1b2cd2b169542e6cc7fd2f1327201ec8be052