Merge gerrit/vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Sat, 3 Dec 2016 04:12:46 +0000 (04:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 3 Dec 2016 04:12:46 +0000 (04:12 +0000)
am: 6c4fe5bd7a

Change-Id: I4048f85f24ef24c8825cb5bbfb62033742a04657


Trivial merge