Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 19:08:45 +0000 (19:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 Jan 2017 19:08:45 +0000 (19:08 +0000)
am: 2d64b0f13c

Change-Id: I6687c416da26d524ddcf03ff4f9436e5dfd8980e


Trivial merge