| commit | be21297d53aa4e1303dd48617c7b5798e8b3f87c | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Fri Oct 08 08:29:23 2021 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Fri Oct 08 08:29:23 2021 +0000 |
| tree | 38a16ba8bc15938f242d8f0b7539f8b375375396 | |
| parent | a3a1e7b7d1f5b680569e65b5efcbaf529a26810b [diff] | |
| parent | 62fbd084887d97c16f6e9bfbc5b181562deaefa8 [diff] |
[automerger skipped] Merge Android 12 am: 65c444d1ca -s ours am: c321495a9d -s ours am: 0111517992 -s ours am: 62fbd08488 -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: I3db7cec4f745b294946228dfe34b3fca288edd3d