Commit 72483d7c authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

[automerger skipped] Merge "Merge "Allow some slop on socket time values" into... 

[automerger skipped] Merge "Merge "Allow some slop on socket time values" into oreo-cts-dev am: 5bb4ad5d" into oreo-mr1-cts-dev am: fed6186c
am: a925c17f  -s ours

Change-Id: If4af96af0145860a8dbdc0a3bd9955dadfe68c66
parents df7da491 a925c17f
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment