Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:43:24 +0000 (16:43 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:43:24 +0000 (16:43 -0800)
commitf54abf0c95f7d92e318ef0c56ff9fc9b7cd8d258
tree0f9e54b58ee42cef71ca83fcced30bfaa52473ad
parent8527ea375a8048367d8f735bf126e29bc3dbcefc
parent83b847f6876a66e673e3de4fda3d4d03f424643b
Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev

Change-Id: Icef189b9af29e090fbb4940af970d91951c2d6e6
Android.mk