Merge "Add sanity checking of API version" into nyc-dev

author David Sodman <dsodman@google.com>

Tue, 5 Apr 2016 20:46:13 +0000 (20:46 +0000)

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

Tue, 5 Apr 2016 20:46:13 +0000 (20:46 +0000)
author David Sodman <dsodman@google.com>
Tue, 5 Apr 2016 20:46:13 +0000 (20:46 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 5 Apr 2016 20:46:13 +0000 (20:46 +0000)
diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
Simple merge
author	David Sodman <dsodman@google.com>
	Tue, 5 Apr 2016 20:46:13 +0000 (20:46 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 5 Apr 2016 20:46:13 +0000 (20:46 +0000)