tree d14f03a57b8325172ca4d38b18cefd199ed43023
parent 46aa5911d810e09e2a90492dd5865cfe25c31b6d
parent 8a55c653458c2d33af506b193e658faf8f88bfa3
author Matt Sarett <msarett@google.com> 1463700683 +0000
committer android-build-merger <android-build-merger@google.com> 1463700683 +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

* commit '8a55c653458c2d33af506b193e658faf8f88bfa3':
  DO NOT MERGE Use updated libpng API

Change-Id: Id8a3a6a56edc5fbc9a10e08d9c09f47850964612