[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)
commitd496dc5ba11dd7a1897fab48fc821e02e56fef10
treed18d08d5bc82319ed2a7863c8425304793131b32
parent8597705aa92fe94858117227f89bfc19bcad353b
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: I302c847ae29c25072081d06b17e78671b7358df0