[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:02 +0000 (10:37 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 May 2018 17:37:02 +0000 (10:37 -0700)
commitb42c18f792c4369ef1774cfe795bcd9d51cbef2c
treedc24695e9e36ef544e14919a0dca094f2c0f2c65
parentedae3a9f2d1c6dae40210a3c1ff4a83ba05f0e31
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: I4198a0ed4f80ff23cb9d55f7ff8e75ccf900a4f2