Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: d04e72de0b
authorPyry Haulos <phaulos@google.com>
Fri, 23 Sep 2016 21:08:41 +0000 (21:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Sep 2016 21:08:41 +0000 (21:08 +0000)
am: eac76634d8

Change-Id: I76cd3fb5a750ee46793edbaaec2eeb596e88a1eb


Trivial merge