| commit | 11cdb91caba47bb7d63f9dcd78be491ab894e447 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 07 00:20:04 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 07 00:20:04 2023 +0000 |
| tree | e6bc18176b3a70a107c41e1802ae6335640689d0 | |
| parent | 80303d3869acf63938416f19f7e2d2f59953d2ff [diff] | |
| parent | 49234b04bc52c97521f5af6b0622541c3f7a3007 [diff] |
[automerger skipped] Merge Android 14 am: 5c3d890abd -s ours am: d96a3d824e -s ours am: f21345055a -s ours am: 8279e8612c -s ours am: 49234b04bc -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: I01154cc6f947a370cf68d0a1fa1492ed2ee03132 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>