Merge "Fix inSampleSize != 1 gainmap decoding" into udc-dev am: 7ad4c65e29 am: 1fb6385d52
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23912844 Change-Id: Ie2bb9ad8cb874450f663abd38a051ba7d5696051 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: