Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 68408cad8f
authorPyry Haulos <phaulos@google.com>
Tue, 24 Jan 2017 19:45:39 +0000 (19:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 24 Jan 2017 19:45:39 +0000 (19:45 +0000)
am: 81e6e20395

Change-Id: Ia2a6111596af7621485b406da9ad5b046f8a43d5


Trivial merge