OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7641889 5527fd1)
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5
authorJohn Reck <jreck@google.com>
Thu, 19 May 2016 22:21:46 +0000 (22:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 May 2016 22:21:46 +0000 (22:21 +0000)
am: 5527fd1323  -s ours

* commit '5527fd1323cc1d6470576386c8298f45c3895d75':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I14fe8c28299ba6bb94cd51d1bc9c637be7766cbd


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help