Commit 8f995373 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 

am: 2976bd48

* commit '2976bd48':
  Allow some rounding on SO_TIMEOUT values

Change-Id: I51d0869ad21320382e02d7b20478308bc1e951b6
parents edfb499b 2976bd48
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