Merge "cmake: Use FindPNG instead of find_path/find_library" am: 382559a6e7 am: 564dd...
authorChad Versace <chad.versace@intel.com>
Fri, 3 Nov 2017 20:05:13 +0000 (20:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Nov 2017 20:05:13 +0000 (20:05 +0000)
am: 61dd59ffb5

Change-Id: I11a26229358b5da98429ba6bf28180865c9b589e


Trivial merge