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

Change-Id: I220f40d55094c308e4684a7da35c2ed030ca5ddb


Trivial merge