Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: c85249943b am: c5b63ae362
authorPyry Haulos <phaulos@google.com>
Tue, 27 Sep 2016 20:27:16 +0000 (20:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Sep 2016 20:27:16 +0000 (20:27 +0000)
am: 49c86a205b

Change-Id: I40f86bef2b2399867b455ee21c84a9774939f5fc


Trivial merge