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

Merge "Allow some rounding on SO_TIMEOUT values" am: 7564dd83 am: 6d24174d 

am: 76c0f64d

* commit '76c0f64d':
  Allow some rounding on SO_TIMEOUT values

Change-Id: I1e7ae273f3a2d365d691d73109809a3a70ecc9cf
parents a4eb161b 76c0f64d
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