tree e6bc18176b3a70a107c41e1802ae6335640689d0
parent 0cf01794c8289530cfe9e205cdb2ad58e16c85c7
parent 1c34b0f04a1dfea23caaf906e8d5665d37cbfba4
author Xin Li <delphij@google.com> 1693268749 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1693268749 +0000

[automerger skipped] Merge Android U (ab/10368041) am: 278c52dc59 -s ours am: e369d208de -s ours am: a2446ad0f2 -s ours am: 1c34b0f04a -s ours

am skip reason: Merged-In I2087549f00883c6ce2a3d9833cff5fde547afaf1 with SHA-1 26e7ab7854 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/image_io/+/24182803

Change-Id: I14029dfe214ddf54286cecf8d299476b137cb571
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>