commit | f21345055ab858db24cae80a956575ce1b35d1ca | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 06 08:59:09 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 08:59:09 2023 +0000 |
tree | e6bc18176b3a70a107c41e1802ae6335640689d0 | |
parent | e369d208de3ce2d7163b39c8749eb18016bfdbab [diff] | |
parent | d96a3d824ec1e51655573c16e2f2268350766611 [diff] |
[automerger skipped] Merge Android 14 am: 5c3d890abd -s ours am: d96a3d824e -s ours am skip reason: Merged-In I2087549f00883c6ce2a3d9833cff5fde547afaf1 with SHA-1 26e7ab7854 is already in history Original change: https://android-review.googlesource.com/c/platform/external/image_io/+/2776342 Change-Id: I743e4710fd53c430b33ababb65aa8a435e75e062 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>