OSDN Git Service

Merge "AAPT2: Ignore trailing data after IEND chunk in PNG" into oc-dev am: 2d885e942d
authorAdam Lesinski <adamlesinski@google.com>
Thu, 18 May 2017 17:56:15 +0000 (17:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 May 2017 17:56:15 +0000 (17:56 +0000)
am: 0196460f27

Change-Id: I8bff9b440b5a1f75d75e3601b654aa8825cf9523


Trivial merge