Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 68408cad8f am: 81e6e20395
authorPyry Haulos <phaulos@google.com>
Tue, 24 Jan 2017 19:48:12 +0000 (19:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 24 Jan 2017 19:48:12 +0000 (19:48 +0000)
am: 65d27d1ecb

Change-Id: I888b7e7d8168e0aa004fb708ca6eb9bf42a68e6a


Trivial merge