Merge "Add check to ensure memory and heap with DEVICE_LOCAL flags are consistent...

author Pyry Haulos <phaulos@google.com>

Mon, 21 Mar 2016 21:11:12 +0000 (21:11 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 21 Mar 2016 21:11:12 +0000 (21:11 +0000)
author Pyry Haulos <phaulos@google.com>
Mon, 21 Mar 2016 21:11:12 +0000 (21:11 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 21 Mar 2016 21:11:12 +0000 (21:11 +0000)
diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp

index 0cc760d,60f0498..0965e16

mode 100644,100755..100644
--- 1/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
--- 2/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
author	Pyry Haulos <phaulos@google.com>
	Mon, 21 Mar 2016 21:11:12 +0000 (21:11 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 21 Mar 2016 21:11:12 +0000 (21:11 +0000)