Commit 119a08ce 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  -s ours

Change-Id: I6d38c5344f45349e96ae04288604f62e1b45813d
parents 214945b9 fed6186c
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