tree c71523d8840b33fe815dc0cc048a2b83a8504094
parent 027b403e8aa90ddc533e39e623df09fc319bb6ee
parent 75dea9ca3aabe23bed2d9f15b70dbdd5efb18cd1
author Matt Sarett <msarett@google.com> 1463700500 +0000
committer android-build-merger <android-build-merger@google.com> 1463700500 +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 am: b02b2fe392
am: 75dea9ca3a

* commit '75dea9ca3aabe23bed2d9f15b70dbdd5efb18cd1':
  DO NOT MERGE Use updated libpng API

Change-Id: I75e0414350115ec133d9905263c01c3b385512b3