diff options
| author | Neil Fuller <nfuller@google.com> | 2014-12-12 10:54:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-12 10:54:36 +0000 |
| commit | d0ba011097c1697ca101616fd9e1d92c2fe6b028 (patch) | |
| tree | c0a3b25cccbd657ea4226357c2aee54e96fc7134 /annotations/generate_annotated_java_files.py | |
| parent | 8edeef21e47c2fd104fc6e1c8b26fc913945e0b9 (diff) | |
| parent | 9603baeeee84f844f27e2e0f03283dc87bda4470 (diff) | |
am 9603baee: am 5bca0d94: am c8e1b9c1: resolved conflicts for merge of bfeba0c4 to jb-mr2-dev-plus-aosp
* commit '9603baeeee84f844f27e2e0f03283dc87bda4470':
Fix for TLS HTTP connections with GMS sockets
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions