diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-03-18 13:10:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-18 13:10:11 -0700 |
| commit | 5c21cb19f0ac094ed418a43fd82e2da9d5118844 (patch) | |
| tree | d5e5535098a1415386f7e2257b40772f43cf2636 /annotations/generate_annotated_java_files.py | |
| parent | 26e3b66f8998fd1efcd0a8029014ade93e7c23ec (diff) | |
| parent | a33fb54fb887139d923d33ffa0dca86b1fd4d7e0 (diff) | |
am a33fb54f: (-s ours) am 44fa6764: DO NOT MERGE: Ensure sslSelect is non-blocking
* commit 'a33fb54fb887139d923d33ffa0dca86b1fd4d7e0':
DO NOT MERGE: Ensure sslSelect is non-blocking
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions