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

Change-Id: I8a49d35cc9cb413a5e0f5dc3b9e9a6d0e2f1edbb


Trivial merge