| commit | 794a9bd78b9a214e116ff07c548104b65683abfd | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Nov 25 18:19:56 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 25 18:19:56 2024 +0000 |
| tree | 3c1fc0682b5d55563076bfb13d9a8982b1ee9b02 | |
| parent | fd59b2ab971863eaac57561f7217c7896997b2af [diff] | |
| parent | f9a80c72d702edbb130f6cbe4f080f8be11b0444 [diff] |
[automerger skipped] Merge "Merge ab/AP4A.240925.013 into aosp-main-future" into aosp-main-future am: f9a80c72d7 -s ours am skip reason: Merged-In I24f28c7f36c13f94fb68b44a4a5a0ccebaad7158 with SHA-1 c32e669e3d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/29740098 Change-Id: I48ab52a535414b57dac72fb7a5b730d321e3d9d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>