[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)
commit2caa0005d102399c6d10679351102dcdf27bdb46
tree48276ce25141ef0459f044c59687078c9d7f3f77
parent6b71e26ff13fe340b01913ac61b878e269d20238
parentb9ddb8a5e66931691b6d99203cac7b2e3e4d014d
[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
am: b9ddb8a5e6  -s ours

Change-Id: I7476bbb201a31459c388ea363a17c1bdbb6b8fea