Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 8bff020a8a am: c047913d3d...
authorPyry Haulos <phaulos@google.com>
Sat, 12 Nov 2016 02:32:41 +0000 (02:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 12 Nov 2016 02:32:41 +0000 (02:32 +0000)
am: 2ca88576a8

Change-Id: Iac94595b1cbf38c3848c14634dbd0520782f04ec


Trivial merge