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