Merge "Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master" am: 736c624044
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 19:11:26 +0000 (19:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 4 Jan 2017 19:11:26 +0000 (19:11 +0000)
am: 932d0bdeb9

Change-Id: I80685f224ab8f36ffda46d8c1de10d48d75d033f


Trivial merge