tree 0923016bf8da4667f8765c80632097c8132a4f33
parent 877dcba47ac311aa65b27e42b3625bcb58d84e47
parent 1f814d7630c56cc9e825ed411e068414c97acb6c
author Matt Sarett <msarett@google.com> 1463699334 +0000
committer android-build-merger <android-build-merger@google.com> 1463699334 +0000

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

* commit '1f814d7630c56cc9e825ed411e068414c97acb6c':
  DO NOT MERGE Use updated libpng API

Change-Id: Ib381e8ccefe9181911a2144d7255ecadefb42b5c