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

Change-Id: Ibb76b1d7817481633fded75f17627355d9914f8b


Trivial merge