[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:55:42 +0000 (10:55 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 May 2018 17:55:42 +0000 (10:55 -0700)
commit6f4552b328d46c82a63c88bf907441bcd6b456f9
tree66842acd5c42ae70aa91ab6f8b622c687690b215
parentf33f10e93c96cfa6dfb042adfae2c3b0ca10d5d7
parent43e7ea94f968b1f6a6a612137c5b9cef81f84881
[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: b42c18f792  -s ours
am: 43e7ea94f9

Change-Id: Ifc691bfc9d81d3ba6749f2f63686ec3de272f440