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)
Change-Id: Ieccd2e74ca11d5a4b7b06f78bae0094e5a870b69

1  2 
Android.mk

diff --cc Android.mk
Simple merge