Merge upstream-vulkan-cts-1.0-dev into master am: c641c2e631 am: ff17828d24 am: cac26...
authorPyry Haulos <phaulos@google.com>
Tue, 16 Aug 2016 13:13:24 +0000 (13:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 Aug 2016 13:13:24 +0000 (13:13 +0000)
am: 9093b91cc6

Change-Id: I0f0598bf082290a800e93d1c6d487a9629c7916f


Trivial merge