Commit f73ed615 authored by Bernie Innocenti's avatar Bernie Innocenti Committed by android-build-merger
Browse files

Merge "bionic: Convert res_send.c to poll()" am: 57fe8130 am: 46682c3c 

am: b64c85af

Change-Id: I3d518e607000f1fd02fdcc40662ca597a3f4f5d5
parents 9b273491 b64c85af
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