Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master am: d04e72de0b am: eac76634d8...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:29:08 +0000 (18:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:29:08 +0000 (18:29 +0000)
am: 6c60542c23

Change-Id: I5448311acc22c4dcfc553a17bdcd351babe2e8ed


Trivial merge