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

Change-Id: I31218eb8140c0ab39e07f987d273ef7c8f748e3a


Trivial merge