Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 68e9111d15 am: 0e5e3a7b7d...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 17:40:18 +0000 (17:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:40:18 +0000 (17:40 +0000)
am: d443f1996a

Change-Id: I23b55718da770db6043f43f8957e0fcd6cf04884


Trivial merge