tree 38a16ba8bc15938f242d8f0b7539f8b375375396
parent c787c1886761199c3c2070ce39a9c3993b7d221f
parent be21297d53aa4e1303dd48617c7b5798e8b3f87c
author Xin Li <delphij@google.com> 1633683573 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683573 +0000

[automerger skipped] Merge Android 12 am: 65c444d1ca -s ours am: c321495a9d -s ours am: 0111517992 -s ours am: 62fbd08488 -s ours am: be21297d53 -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: I8d2303d80ffc51747668528f3c93aaaf06b65e22