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