Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: c85249943b am: c5b63ae362...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:31:02 +0000 (18:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:31:02 +0000 (18:31 +0000)
am: c27db44702

Change-Id: Ie5ce6ec390de11dffc5e48bd4ed3775d6e8f4c12


Trivial merge