[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulka...
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>
Mon, 30 Apr 2018 17:48:15 +0000 (10:48 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 30 Apr 2018 17:48:15 +0000 (10:48 -0700)
am: a3bacba8b1

Change-Id: I15dbddb5b202e4a7eac6a67fb62fab4d3084ff9a


Trivial merge