tree c5f81f52a0b14a2993fb3b173eec5c0d005a1fa4
parent 95eaf00fc5ccc174cbcd7a27b177f2a74d64a4ac
parent 27e12ac2112e19535100bc531bbfe2f7a0b34957
author Leon Scroggins <scroggo@google.com> 1521568267 +0000
committer android-build-merger <android-build-merger@google.com> 1521568267 +0000

Merge "Scale up in ImageDecoder based on API level" into pi-dev am: 83ad4e53b6
am: 27e12ac211

Change-Id: Ie015dd5fe1ebcf66fbb347c9183062c6cd5b1714