Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: f2ed7081f2 am: 0f428ec334
authorPyry Haulos <phaulos@google.com>
Thu, 1 Sep 2016 19:38:48 +0000 (19:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Sep 2016 19:38:48 +0000 (19:38 +0000)
am: 0e39b0c893

Change-Id: Ied0b766da96a798cf1e71192eeec4cda3b8d07f0


Trivial merge