Merge vulkan-cts-1.0.2 into aosp/master am: 55da06144c am: d905a013d0
authorPyry Haulos <phaulos@google.com>
Thu, 6 Apr 2017 22:38:47 +0000 (22:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Apr 2017 22:38:47 +0000 (22:38 +0000)
am: c91ce3f2a2

Change-Id: Icb5a99c9ff720093b01f2dc667bd81dda12a5eb5


Trivial merge