tree cc9a1d532eb61f879efa52fb8882d492edc0aa98
parent ccf1b95c089810fee588dad1ff9477dfac876320
parent b898481de7f2d3d7617da04a58aa320e58aa72a4
author Matt Sarett <msarett@google.com> 1463702845 +0000
committer android-build-merger <android-build-merger@google.com> 1463702845 +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 am: 8a55c65345
am: b898481de7

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

Change-Id: I5cdfad96ed0a6ffde2c197ef7957192d9b0c1a16