tree 2337612fa98285c2b2a5e8eb16a40692298c8cbf
parent f4ee1720f33a01518f79a2bf8df4664dab3564d4
parent ca45737e272aeefd657451a6faaa088d1903378c
author Matt Sarett <msarett@google.com> 1463699530 +0000
committer android-build-merger <android-build-merger@google.com> 1463699530 +0000

resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630
am: ca45737e27

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

Change-Id: Ia9c36583c9d60d01fec7ee9aefc973dabb1c07d3