[automerger skipped] [automerge] Replace BitmapRegionDecoder with ImageDecoder 2p: 0699193115 am: d6fe29d6e6 -s ours am: 1f2262c366 -s ours am: 57527068f0 -s ours
am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 08d1494421 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16681833
Change-Id: I43176995811e0ca8c14bf76ae159d40ff9209139
This commit is contained in:
committed by
Automerger Merge Worker
commit
5c2d65774a