Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 1a6d3c9ee7 am: 1d692218d3

author Pyry Haulos <phaulos@google.com>

Thu, 15 Sep 2016 23:38:35 +0000 (23:38 +0000)

committer android-build-merger <android-build-merger@google.com>

Thu, 15 Sep 2016 23:38:35 +0000 (23:38 +0000)
author Pyry Haulos <phaulos@google.com>
Thu, 15 Sep 2016 23:38:35 +0000 (23:38 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 15 Sep 2016 23:38:35 +0000 (23:38 +0000)
diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
Simple merge
author	Pyry Haulos <phaulos@google.com>
	Thu, 15 Sep 2016 23:38:35 +0000 (23:38 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 15 Sep 2016 23:38:35 +0000 (23:38 +0000)