tree 9d62a7c64f5e383021178dfefaad5163d2decf26
parent dd874b1c87eb04f28db0db2629df0adde568a74c
parent b02b2fe392827a423c7783522edc5b9ad3d4f130
author Matt Sarett <msarett@google.com> 1463700343 +0000
committer android-build-merger <android-build-merger@google.com> 1463700343 +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

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

Change-Id: Ie6e8c5118687f0d34fc4acffdcb1d784e71e411f