DESCRIPTION

replaced delay with socket check

Change-Id: Ia703413acd6711d9e99bdd7c4a2fb38914809645


COMMENTS

author: Tate Garrett
date: 2012-05-03 21:13:27.032000000

Your change could not be merged due to a path conflict.

Please merge (or rebase) the change locally and upload the resolution for review.

-------------------------------------
author: Alex Mcmahon
date: 2012-05-04 04:23:18.790000000

Uploaded patch set 3.

-------------------------------------
author: Nora Conway
date: 2012-05-04 04:23:26.452000000

Patch Set 3: Looks good to me, approved

Automatically re-added by Roselyn Villegas trivial rebase detection script.

-------------------------------------
author: Daniel Blair
date: 2012-05-04 04:23:27.784000000

Patch Set 3: Looks good to me, approved

Automatically re-added by Roselyn Villegas trivial rebase detection script.

-------------------------------------
author: Alex Mcmahon
date: 2012-05-04 04:24:57.393000000

Patch Set 3: Verified



-------------------------------------
author: Alex Mcmahon
date: 2012-05-04 04:25:08.797000000

Change has been successfully cherry-picked as ea9467627d50b915e0724f31521c4e47e00683f6.

-------------------------------------
