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)
commitd83e42eda39acbcf4eda3a8b88959a3ebdc98ade
treef48c847be442528ff6215b3de771a5d812a0a0ff
parentc74832c803b5df82482747fd4dd11fa1d7b6badc
parent66a0fd81f5d31be733370aa9f946053e22dd41fe
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Icdbfda5c3815cf424e8cc0065a5e73955f016c51
AndroidGen.mk