tree 77f2eff6d1f26ccf8ca419697d34d04faa5373ee
parent 6e267ffb6f981d1abd9913c5d0d9856771254fdb
parent bccea7a8613f4937f8289f9b7c10e54edd914354
author Jiyong Park <jiyong@google.com> 1524283263 -0700
committer android-build-merger <android-build-merger@google.com> 1524283263 -0700

Merge "Mark libpng as double_loadable" am: c85cbbda3d
am: bccea7a861

Change-Id: I7040e0723974f51eab0c8ee059568b73d15778df