tree a479b73548e2f4b3d831d343b7e22b7a0058c53c
parent 3fcf53f069a1f061007b7f6a4c89302cc66cf62b
parent 488e2c1e840cabf166e01f0beb3695288d692f67
author Tao Bao <tbao@google.com> 1523751087 -0700
committer android-build-merger <android-build-merger@google.com> 1523751087 -0700

Merge "Expose PngHandler via resources.h." am: 3c8fdf3274 am: c41aba80b7
am: 488e2c1e84

Change-Id: I9a5efd24428426f90b54e9fc0569a01332b0eabd