[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:44:05 +0000 (10:44 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 30 Apr 2018 17:44:05 +0000 (10:44 -0700)
commit45afde55e4a36ab818a30a662e687ba255d94934
treeaaa13d119f701c9b96cba261a1a6a241bc62d437
parentf034e66227a2c061cf91a0e52323fb480dcc6d9f
parent64399483f698d9e4379d635459c5edb1529b8884
[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
am: 64399483f6  -s ours

Change-Id: I0cd61f2281758f35ffa898bd299af36fc3b46e7b