[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:27:58 +0000 (10:27 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 May 2018 17:27:58 +0000 (10:27 -0700)
commitb9ddb8a5e66931691b6d99203cac7b2e3e4d014d
tree48276ce25141ef0459f044c59687078c9d7f3f77
parent9800dc30748dbfaccc32ab15e9012fc4e61d20a2
parentea8d8c6e519ac7765c9c587394494033980837ad
[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-mr1-cts-dev
am: ea8d8c6e51  -s ours

Change-Id: Iafc1890dde07fdf56154e1742ce2d59648bc02af