Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 42d91db0aa am: eb419455ef
authorPyry Haulos <phaulos@google.com>
Thu, 8 Sep 2016 22:07:13 +0000 (22:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Sep 2016 22:07:13 +0000 (22:07 +0000)
am: 0df9f6a487

Change-Id: I1844b339595a47396ee34e7625922e6716f45b52


Trivial merge