Commit 76c0f64d 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

* commit '6d24174d':
  Allow some rounding on SO_TIMEOUT values

Change-Id: I8796add73c9ccc8c29b3d6d089357736ac4b2776
parents 56510e48 6d24174d
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