tree 2550940b10ee77fe5560cc6f44fbe383d7c18893
parent a3604da6e17afbf5b98f1eb2c5fc16bde1731b85
parent fc1d9a49d1e33c133c96cf6b04d6f47d3cfaa496
author Matt Sarett <msarett@google.com> 1463700175 +0000
committer android-build-merger <android-build-merger@google.com> 1463700175 +0000

resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d
am: fc1d9a49d1

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

Change-Id: Id9da4d3980f394bf19032581629d0baf9c30e0fc