Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 5f69b27051 am: 399f8849cf
authorPyry Haulos <phaulos@google.com>
Tue, 4 Apr 2017 18:46:07 +0000 (18:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Apr 2017 18:46:07 +0000 (18:46 +0000)
am: fabd9f85b1

Change-Id: I21c635c069009c1e821dc59837d0686b0a557c35


Trivial merge