diff options
| author | Jesse Wilson <jessewilson@google.com> | 2010-10-14 13:40:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-14 13:40:57 -0700 |
| commit | d9523a4fccf57cd61cc37b354657e62085196fe0 (patch) | |
| tree | 1edef9a664872b633a7502b47d1ca5a12cc372c6 /annotations/generate_annotated_java_files.py | |
| parent | 2545edd22e32e1d2e1cd3c70543fcef112c9d66a (diff) | |
| parent | 7fe9c8ad62d8fcedf14ed44761de32a5a7ad569b (diff) | |
am 7fe9c8ad: Merge "Tests for HTTP bugs using HTTPS through a proxy." into gingerbread
Merge commit '7fe9c8ad62d8fcedf14ed44761de32a5a7ad569b' into gingerbread-plus-aosp
* commit '7fe9c8ad62d8fcedf14ed44761de32a5a7ad569b':
Tests for HTTP bugs using HTTPS through a proxy.
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions