Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 2d64b0f13c
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 19:11:15 +0000 (19:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 Jan 2017 19:11:15 +0000 (19:11 +0000)
am: 8777374f40

Change-Id: I7df8be7830c97ff73861706991070532c12ca438


Trivial merge