Merge "Fix several narrowing conversions inside struct initializers"

author TreeHugger Robot <treehugger-gerrit@google.com>

Fri, 27 May 2016 20:19:43 +0000 (20:19 +0000)

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

Fri, 27 May 2016 20:19:44 +0000 (20:19 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Fri, 27 May 2016 20:19:43 +0000 (20:19 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 27 May 2016 20:19:44 +0000 (20:19 +0000)
diff --cc external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateImageObjectUtil.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/query_pool/vktQueryPoolImageObjectUtil.cpp
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Fri, 27 May 2016 20:19:43 +0000 (20:19 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 27 May 2016 20:19:44 +0000 (20:19 +0000)
		1	2
external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateImageObjectUtil.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/query_pool/vktQueryPoolImageObjectUtil.cpp	patch \|	diff1 \|	diff2 \|	blob \| history