Commit 58f4a157 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

Change-Id: Ieb61cb795daf8ed21d9045a31b039a52a50ec1c4
parents a39b276d 02f85ccb
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