tree 38a16ba8bc15938f242d8f0b7539f8b375375396
parent 6508b2b0cc2a9c474b8b3daca77c8aa1f326e558
parent 011151799267b520afd8732dc248f7b2288349f2
author Xin Li <delphij@google.com> 1633679785 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679785 +0000

[automerger skipped] Merge Android 12 am: 65c444d1ca -s ours am: c321495a9d -s ours am: 0111517992 -s ours

am skip reason: Merged-In Ic3587afb9ed0e736b1d25f8714176bff5cee5316 with SHA-1 7d0e0ae85b is already in history

Original change: https://android-review.googlesource.com/c/platform/external/subsampling-scale-image-view/+/1847359

Change-Id: I57c855683f8a2e6ec61dcb474dd7536c0199f9d1