Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: c9061d1b52 am: 3e3c5a179e...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:49:52 +0000 (18:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:49:52 +0000 (18:49 +0000)
am: 5fa25468f3

Change-Id: I1fa8b7359186148cbc72bdb049bcd7e01ce32c1c


Trivial merge