[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulka...
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>
Tue, 1 May 2018 17:37:01 +0000 (10:37 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 May 2018 17:37:01 +0000 (10:37 -0700)
am: b9ddb8a5e6  -s ours

Change-Id: I7476bbb201a31459c388ea363a17c1bdbb6b8fea


No differences found