| commit | 36acff7d7e88549bbeab6a08488ab48596d7fbc5 | [log] [tgz] |
|---|---|---|
| author | Matt Sarett <msarett@google.com> | Thu May 19 23:03:35 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 19 23:03:35 2016 +0000 |
| tree | 2ee8e7c0c42774762ec8920824ba547301535cc4 | |
| parent | 1273956e69a7d1d5b636f269050b446e0ced3f9b [diff] | |
| parent | a5bc59620fd43c99621eb98ac84cbeea867d0c93 [diff] |
resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f * commit 'a5bc59620fd43c99621eb98ac84cbeea867d0c93': DO NOT MERGE Use updated libpng API Change-Id: I3d8d27b08fd1fd89c6b8d9c39b883a45aecb83ce