tree f3989e8a09132b81757a0893a2d7aa8b920ea323
parent 381e71565846ae4146e1ebda3e7752722ca66a38
parent a9d8f3f0f404d68e5880702b56ce4d1fc497e1b8
author Tianjie Xu <xunchang@google.com> 1506734744 +0000
committer android-build-merger <android-build-merger@google.com> 1506734744 +0000

Merge "Move the png open and destroy functions into a class" am: e687c5a1e1 am: 297a994416 am: 408ee90b58
am: a9d8f3f0f4

Change-Id: I6e3bb6029eb6413edee9b853a38d194c68a0310e