| commit | 0880143c18b757bc7ff341e3825964fde2021f01 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Mar 07 10:49:59 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 07 10:49:59 2024 +0000 |
| tree | 2dbb6862c744d80d6766cac19207effeb033c22c | |
| parent | 07ab1a173a5d53550a967a099a95e6a8c0049001 [diff] | |
| parent | e4027b856c7281ac0423784c6e33805681a0905d [diff] |
[automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: 099135510a -s ours am: e4027b856c -s ours am skip reason: Merged-In I4415e3fc418879e4e9e346826ac0335d7f1fd75c with SHA-1 31d5d78291 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2990001 Change-Id: Ifa4bc7a31795094889ddcf06ac90f45f5842e4c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>