Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 47d74e847e
authorPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 22:18:38 +0000 (22:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Jan 2017 22:18:38 +0000 (22:18 +0000)
am: c7c28e6fa6

Change-Id: Ie15ee5b0dd59291458e17d6d48fd0bd984be316f


Trivial merge