Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:25:16 +0000 (16:25 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:25:16 +0000 (16:25 -0800)
commit8527ea375a8048367d8f735bf126e29bc3dbcefc
tree8c8bfb33e2bf46e5a2d4903b5296114bee1a7d9e
parentea48ba8b2b97a79c1ad1331def0187afb6a74c1a
parentae1efbd89dc15759f4543d21a0af8cf1079d704d
Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev

Change-Id: Ieccd2e74ca11d5a4b7b06f78bae0094e5a870b69
Android.mk