Commit a39b276d 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 

am: b761df4f

Change-Id: I6317bfb8bd578a4f6db0247d8c25a5178991ba7d
parents 178c8e3f b761df4f
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