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

Merge "Merge "Allow some slop on socket time values" into oreo-cts-dev am:... 

Merge "Merge "Allow some slop on socket time values" into oreo-cts-dev am: 5bb4ad5d" into oreo-mr1-cts-dev
am: fed6186c

Change-Id: Icf37ca3cf05a26bee1ace6b85ca23c665fe603b7
parents bfe645e1 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