Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Fri, 23 Sep 2016 21:06:40 +0000 (21:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Sep 2016 21:06:40 +0000 (21:06 +0000)
am: d04e72de0b

Change-Id: Idf39bf7b3d87b897c3263a0ab8053c0cb21d9059


Trivial merge