Merge "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: 736c624044

Change-Id: I2deda8973d9320fa2955bedab4a1f0df91437da8


Trivial merge