tree f6d684ab181b0395b15c8c1e3644d04758e57e51
parent ae68f0227262d08f250e4cccda6f03b9981bf56d
parent 300af0779de3c2658f32e3de40adc41dae92df1e
author Matt Sarett <msarett@google.com> 1463700022 +0000
committer android-build-merger <android-build-merger@google.com> 1463700022 +0000

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

* commit '300af0779de3c2658f32e3de40adc41dae92df1e':
  DO NOT MERGE Use updated libpng API

Change-Id: Iac60caa51e747fcde2c08ddf06323e8b1e98f36a