Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Thu, 20 Oct 2016 18:42:41 +0000 (11:42 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 20 Oct 2016 18:42:41 +0000 (11:42 -0700)
commit812d768b55dcedf2c0fda63e69db3c05600f379d
tree76064111d29dc97dc467d8dfe78c3cab42b8a0e0
parent05e378a71d3da241d1d15fd9c23b6257111355a5
parent9c9bec54eeaf199c74f62ed9a4eb054ef2c4fb88
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master

Change-Id: Ia92eae5ac913055ba0cd769b8ca3ac877e02d48c