Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: 2f2ce0f048 am: ea762c3174...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:31:17 +0000 (18:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:31:17 +0000 (18:31 +0000)
am: 12568ee7fd

Change-Id: I12dbc1c0ca6b861b37b9f5168617d69226dfd35e


Trivial merge