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

am: a39b276d

Change-Id: I760e7092068876e74f63926e4c7919d04fbdf13a
parents 4d3a91b0 a39b276d
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