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

Change-Id: If413dd57f2c950aae1e9cf19e2194648a311700d


Trivial merge