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

Merge "Make the resolver retry timeout configurable via __res_params" am:... 

Merge "Make the resolver retry timeout configurable via __res_params" am: fce5dae8 am: b761df4f am: a39b276d
am: eda45437

Change-Id: I176312f3b25b1a1cfa750e1d50de1d613388610a
parents b1a5163e eda45437
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