diff options
| author | Neil Fuller <nfuller@google.com> | 2015-09-01 10:06:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 10:06:52 +0000 |
| commit | c510037b2835ad36a559f7af672f3036ed40c750 (patch) | |
| tree | 6770798b4a4f67f62a5450ac91c94dc8f51a197a /annotations/generate_annotated_java_files.py | |
| parent | 3078014cc01797ada5189e05f559bf05d371b980 (diff) | |
| parent | ecdd89b848b716110df99b556a7cea58b17d4ee7 (diff) | |
am ecdd89b8: am b472314a: am 34d183b4: Merge "Revert "Changes associated with an OkHttp bad proxy response fix"" into lollipop-cts-dev
* commit 'ecdd89b848b716110df99b556a7cea58b17d4ee7':
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions