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