Commit b761df4f 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: fce5dae8

Change-Id: Iab2fdf13f688bbb2ed83af7f1aa0683a344537c1
parents 270a4bd5 fce5dae8
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