tree 3753615d8113887e0d67f190755d789f263ead03
parent 682d6910526a55e6a20e27cde3cf7515fa07a97b
parent aa02888e55147ec78fa5636a87e2447bda136d68
author Matt Sarett <msarett@google.com> 1463699872 +0000
committer android-build-merger <android-build-merger@google.com> 1463699872 +0000

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

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

Change-Id: I10705dd579623e4b208093cfc4839aad496081c8