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