tree 4d34ca967b45a1de455a2fa70febf6e582d2f51c
parent 87f6f24f4b6beb3260e2f37c578c80d5677e0650
parent 07e1c83bad1c25472f591bcd977532b4f23e16ca
author Leon Scroggins <scroggo@google.com> 1522329253 +0000
committer android-build-merger <android-build-merger@google.com> 1522329253 +0000

Merge "Rename ImageDecoder.setResize" into pi-dev am: 6078631927
am: 07e1c83bad

Change-Id: I8d5bd9332d982cf953947d888afd25c566ca5460