tree 38a16ba8bc15938f242d8f0b7539f8b375375396
parent 7d0e0ae85b62b0413f96d61fe5e9e830807921b8
parent 65c444d1ca57cd031cbcddb4610f05ccb6b6463f
author Xin Li <delphij@google.com> 1633655983 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633655983 +0000

[automerger skipped] Merge Android 12 am: 65c444d1ca -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: I5223a5c00643b56d14da43721d441332ea0e78ce