[automerger skipped] [RESTRICT AUTOMERGE] Merge remote-tracking branch 'khronos/vulka...
authorChris Forbes <chrisforbes@google.com>
Mon, 10 Sep 2018 22:31:15 +0000 (15:31 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Sep 2018 22:31:15 +0000 (15:31 -0700)
am: 4eb31660f7  -s ours

Change-Id: Id4582490a4045249c6c2818ac51548d047460011


Trivial merge