Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Fri, 23 Sep 2016 19:23:40 +0000 (12:23 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 23 Sep 2016 19:23:40 +0000 (12:23 -0700)
commitd04e72de0bd3c997ad87756837cea1a52f12e7bc
tree88b61d1722495ba32f0a0e078522a3ae50ca6f56
parentb3729a6431b881ac9d9c783b3d777e3fb20c6a7c
parentf82bf19142d1804c86ba1c327979878f4c684524
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master

Change-Id: Ie1fb552e9f5e1c00ea0c986579e6e81681fdf9c1