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

Change-Id: Ie5adae071148ed2d2a00a0d2840110dffddb6d30


Trivial merge