resolve merge conflicts of a9ffcc1 to master
authorPyry Haulos <phaulos@google.com>
Mon, 13 Jun 2016 22:21:10 +0000 (15:21 -0700)
committerPyry Haulos <phaulos@google.com>
Mon, 13 Jun 2016 22:21:10 +0000 (15:21 -0700)
commit2b86a86f0d8aa04e0952edfb333a021b2c67744e
tree2a20f0beb25243deab7b1a42a9f99b9511f880b6
parent39ef7dc68d1d704b4907f13f864f1dd70a8a020b
parenta9ffcc1f923355de77477589a134d8579425ca49
resolve merge conflicts of a9ffcc1 to master

Change-Id: I35f661fbec0f2118af483f4a73004f2f8b94528e
android/cts/master/com.drawelements.deqp.vk.xml
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp
external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.hpp
external/vulkancts/modules/vulkan/ubo/vktUniformBlockTests.cpp