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

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

[automerger skipped] Merge "Allow some slop on socket time values" into oreo-cts-dev am: 5bb4ad5d am: a3700871 am: 9bf5d886
am: 66203dce  -s ours

Change-Id: I0ebbc479d080b36dde0fbb4bffaf31b01ea500a5
parents 72483d7c 66203dce
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