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