Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
authorPyry Haulos <phaulos@google.com>
Fri, 6 Jan 2017 20:45:52 +0000 (12:45 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 6 Jan 2017 20:45:52 +0000 (12:45 -0800)
commitdd932ed8582123ebef66fb6f70d206c252a084fe
treeed8632f6504b27f31f36ba7eb095818ea0fc04a9
parent736c62404462744aa62a15c7bab2d1ee23f9734d
parentc892f7170725304d295fe2d10118d07025b506a9
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master

Change-Id: I650f4ef2c848a0957f652b3bf8b17ee7a7e4319c