[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:32:26 +0000 (10:32 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 30 Apr 2018 17:32:26 +0000 (10:32 -0700)
commitc78fc14ea59872f641d8e4ebaeeecbfdc86bc191
treebc4d4167a3f844c3dc5cfd56cd7688b7ecf907b0
parentc6b54152209cd1d9dd11608317243805b60fd1ec
parent354706417a762758afeebf4e12c9e7e59dc7be9a
[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

Change-Id: I37e6dad1ab2d2eb9bee4a529f16c77981afbb54b