Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: b3729a6431 am: 1e31d89c2a

author Pyry Haulos <phaulos@google.com>

Thu, 22 Sep 2016 23:23:30 +0000 (23:23 +0000)

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

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