tree 796b7e9be0a225e772efa1c86a2de7870ea4ed37
parent bd77ad8650be850ef34994f77fc08b36ed35349a
parent 27891849287a1bbc726ec81a29b6d72eae26f6e3
author Brian Carlstrom <bdc@google.com> 1452752118 +0000
committer android-build-merger <android-build-merger@google.com> 1452752118 +0000

Merge "Add libpng_ndk variant" am: dfa9650494
am: 2789184928

* commit '27891849287a1bbc726ec81a29b6d72eae26f6e3':
  Add libpng_ndk variant