tree 0923016bf8da4667f8765c80632097c8132a4f33
parent 877dcba47ac311aa65b27e42b3625bcb58d84e47
parent 36acff7d7e88549bbeab6a08488ab48596d7fbc5
author Matt Sarett <msarett@google.com> 1463699166 +0000
committer android-build-merger <android-build-merger@google.com> 1463699166 +0000

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

* commit '36acff7d7e88549bbeab6a08488ab48596d7fbc5':
  DO NOT MERGE Use updated libpng API

Change-Id: I7f01d932235ef69640ed4859d0e62344b3b774de