Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: b3729a6431
authorPyry Haulos <phaulos@google.com>
Thu, 22 Sep 2016 22:56:00 +0000 (22:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Sep 2016 22:56:00 +0000 (22:56 +0000)
am: 1e31d89c2a

Change-Id: Iac9199d4ae71a88677db8f5f55d801ce0fe840ba


Trivial merge