Merge gerrit/vulkan-cts-1.0-dev into aosp/master am: 6c4fe5bd7a am: ebebe7d3b9 am...
authorPyry Haulos <phaulos@google.com>
Tue, 4 Apr 2017 19:02:42 +0000 (19:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Apr 2017 19:02:42 +0000 (19:02 +0000)
am: 95e52cd9ec

Change-Id: I47ca80abdb9b5d5ec845d5ba59ee3bc59ee46605


Trivial merge