[automerger skipped] Merge "Use new socket schema within TestSlicedCondition" into rvc-dev am: 9f9ca14bb5 am: 80013174b0 -s ours am: b4922ddd1a -s ours

am skip reason: Change-Id Id3c9522c4467c4869ec97226734a556dd9dfb169 with SHA-1 dfd63d4522 is in history

Change-Id: Icd95fdcc53fffccf5f633e2dedb6b41c8d1422f2
This commit is contained in:
Automerger Merge Worker
2020-02-27 23:47:46 +00:00

Diff Content Not Available