Commit 1629545d authored by Bernie Innocenti's avatar Bernie Innocenti Committed by android-build-merger
Browse files

Merge "Clear the resolver timeout when setting default __res_params" am: 817f578b am: 02f85ccb 

am: 58f4a157

Change-Id: I68678b3f84d25b0bd9e81e6977aae29b36718f79
parents eda45437 58f4a157
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