| commit | cdf58e136192aae3130feb502a6cdf26668f17fe | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Fri Mar 18 13:36:19 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 18 13:36:19 2011 -0700 |
| tree | 82de008a3a22fbe45d6445ccabd19847298d5347 | |
| parent | 492cd0c33d104a27599d945ec8d54b0624784e43 [diff] | |
| parent | 482f8305a5aa43cb94a9f05be7c2ffecd1534f13 [diff] |
am 482f8305: (-s ours) am 5c21cb19: (-s ours) am a33fb54f: (-s ours) am 44fa6764: DO NOT MERGE: Ensure sslSelect is non-blocking * commit '482f8305a5aa43cb94a9f05be7c2ffecd1534f13': DO NOT MERGE: Ensure sslSelect is non-blocking