OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca13384 1b1fcba)
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)
am: 1b1fcbaab5

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

Change-Id: I40b173cbfd5fbec21a2b194b573a246af534c315

1  2 
tools/aapt/Images.cpp patch | diff1 | diff2 | blob | history

diff --cc tools/aapt/Images.cpp
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help