Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: c9061d1b52 am: 3e3c5a179e
authorPyry Haulos <phaulos@google.com>
Fri, 18 Nov 2016 20:52:36 +0000 (20:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 18 Nov 2016 20:52:36 +0000 (20:52 +0000)
am: 249f158858

Change-Id: I365df54c53fd9d2bc37e5cc056ce0408af3ae60f


Trivial merge