Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: b3729a6431 am: 1e31d89c2a...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:28:56 +0000 (18:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:28:56 +0000 (18:28 +0000)
am: 3dbc293d8b

Change-Id: I5d8b6783616995d1b6c02e8c349b41d9f3f3acae


Trivial merge