OSDN Git Service

DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2
authorJohn Reck <jreck@google.com>
Thu, 19 May 2016 22:16:42 +0000 (22:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 May 2016 22:16:42 +0000 (22:16 +0000)
commit5527fd1323cc1d6470576386c8298f45c3895d75
tree248011a44556c85fa056c529dde8f53e84dd383d
parentca133845ef815d7cc1f036b1355130a8a867a98c
parent1b1fcbaab5169f824e803bcd97aa848e27dbcafb
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2
am: 1b1fcbaab5

* commit '1b1fcbaab5169f824e803bcd97aa848e27dbcafb':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I40b173cbfd5fbec21a2b194b573a246af534c315
tools/aapt/Images.cpp