Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 984f29db76 am: 26c200ccb2...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:32:01 +0000 (18:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:32:01 +0000 (18:32 +0000)
am: 3342f78603

Change-Id: Ibd49a7e885e0f192abd4d4efe9b2b35294714f29


Trivial merge