Merge gerrit/vulkan-cts-1.0-dev into gerrit/opengl-cts-dev
authorPyry Haulos <phaulos@google.com>
Fri, 2 Dec 2016 22:26:33 +0000 (14:26 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 2 Dec 2016 22:26:33 +0000 (14:26 -0800)
Change-Id: I4a04b54b92d507303ccf09b20b1fd643fe13e134

1  2 
Android.mk

diff --cc Android.mk
Simple merge