tree 2ee8e7c0c42774762ec8920824ba547301535cc4
parent 1273956e69a7d1d5b636f269050b446e0ced3f9b
parent a5bc59620fd43c99621eb98ac84cbeea867d0c93
author Matt Sarett <msarett@google.com> 1463699015 +0000
committer android-build-merger <android-build-merger@google.com> 1463699015 +0000

resolve merge conflicts of 86a28d0 to klp-modular-dev
am: a5bc59620f

* commit 'a5bc59620fd43c99621eb98ac84cbeea867d0c93':
  DO NOT MERGE Use updated libpng API

Change-Id: I3d8d27b08fd1fd89c6b8d9c39b883a45aecb83ce