Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: c9061d1b52 am: 3e3c5a179e...
authorPyry Haulos <phaulos@google.com>
Tue, 4 Apr 2017 18:59:10 +0000 (18:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Apr 2017 18:59:10 +0000 (18:59 +0000)
am: 1c1ca2aea2

Change-Id: I0955212485688623fec59e38c6364c74f5246b0b


Trivial merge