Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 18 Oct 2018 18:22:07 +0000 (20:22 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 18 Oct 2018 18:22:07 +0000 (20:22 +0200)
Change-Id: Icdbfda5c3815cf424e8cc0065a5e73955f016c51

1  2 
AndroidGen.mk

diff --cc AndroidGen.mk
Simple merge