[automerger skipped] [RESTRICT AUTOMERGE] Merge remote-tracking branch 'khronos/vulka...
authorChris Forbes <chrisforbes@google.com>
Wed, 28 Nov 2018 00:40:35 +0000 (16:40 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Nov 2018 00:40:35 +0000 (16:40 -0800)
am: fdbb6e46f1  -s ours

Change-Id: I006f99766872235e3c341d1159965f7437948129


Trivial merge