[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulka...
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>
Mon, 30 Apr 2018 17:39:59 +0000 (10:39 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 30 Apr 2018 17:39:59 +0000 (10:39 -0700)
commit64399483f698d9e4379d635459c5edb1529b8884
treebc4d4167a3f844c3dc5cfd56cd7688b7ecf907b0
parent0b5495e302bcd742aa7a59049749cca9318732cd
parentc78fc14ea59872f641d8e4ebaeeecbfdc86bc191
[automerger skipped] Merge "DO NOT MERGE: Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD" into oreo-cts-dev am: 354706417a  -s ours
am: c78fc14ea5  -s ours

Change-Id: Ib2acbf2e335b712ea3f16c46168915079b16e6a2