Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: f2ed7081f2 am: 0f428ec334...
authorPyry Haulos <phaulos@google.com>
Thu, 1 Sep 2016 19:41:49 +0000 (19:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Sep 2016 19:41:49 +0000 (19:41 +0000)
am: d998efd030

Change-Id: I152cb4280ffeee9f96ddce5190c4def7b73cd89a


Trivial merge