Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 68408cad8f am: 81e6e20395...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 20:46:53 +0000 (20:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 20:46:53 +0000 (20:46 +0000)
am: 79f9356d50

Change-Id: I699758a10d92ac3a62c2abc4ade015f0b75fae29


Trivial merge