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

Change-Id: I935f0da4d458f8e2005e2d42446ef82595de8464


Trivial merge