commit | aa02888e55147ec78fa5636a87e2447bda136d68 | [log] [tgz] |
---|---|---|
author | Matt Sarett <msarett@google.com> | Thu May 19 23:14:39 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu May 19 23:14:39 2016 +0000 |
tree | 4c4c37daab6c73dee236b9cf58d2e8c33f5303d9 | |
parent | cae056f21908173bcf2fa9a1724e46f16abb3258 [diff] | |
parent | 8a1d4e97ad3b748a06db618f9d7ccf5114ea16d0 [diff] |
resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad * commit '8a1d4e97ad3b748a06db618f9d7ccf5114ea16d0': DO NOT MERGE Use updated libpng API Change-Id: I09e8917976c05beec8bf881140539948c323ce58