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

Change-Id: I5a7f593b5301a76a4e4a1d89c9d06a2a08a4fe50


Trivial merge