commit | 15b0eb7df05772518fcc98f0a95410548f7481bc | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Dec 11 22:57:26 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 11 22:57:26 2023 +0000 |
tree | a877ba29fbd59ac3e2878289e2c9fe87fb3d1a01 | |
parent | 7e0c115926cf71ff513f83bf6f0de2dc1618d3f4 [diff] | |
parent | 15ae2dcd24d0f8f2959b5aef12fbe51ff61b2044 [diff] |
[automerger skipped] Merge Android 14 QPR1 am: 8d150b3985 -s ours am: 6c6a218cd7 -s ours am: 15ae2dcd24 -s ours am skip reason: Merged-In I457840158072f5d020d00875f3de1b32c9ab5665 with SHA-1 e6bd4911b7 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2866436 Change-Id: I969e5c97da3b1c1c3382abe3347440f1ce63d2c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>