diff options
| author | Jesse Wilson <jessewilson@google.com> | 2010-10-14 13:40:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-14 13:40:53 -0700 |
| commit | 2545edd22e32e1d2e1cd3c70543fcef112c9d66a (patch) | |
| tree | 9b186c9472e0c13475064c643c991f50cb2900b0 /annotations/generate_annotated_java_files.py | |
| parent | 4a0c7d60ce66e466cda5d2d8b470847132e18a0c (diff) | |
| parent | 5b539e574f03fd07a03d8b9acfdad1599f947918 (diff) | |
am 5b539e57: Merge "Fix HTTPS hostname verification to use the URL host, not the proxy host." into gingerbread
Merge commit '5b539e574f03fd07a03d8b9acfdad1599f947918' into gingerbread-plus-aosp
* commit '5b539e574f03fd07a03d8b9acfdad1599f947918':
Fix HTTPS hostname verification to use the URL host, not the proxy host.
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions
