diff options
| author | Neil Fuller <nfuller@google.com> | 2015-09-01 20:13:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 20:13:42 +0000 |
| commit | 7b62f2d19e186f5143ee2d6800467aa5f5dafd6e (patch) | |
| tree | 3c33a58425b68749714b711ef240fa05104b5a17 /annotations/generate_annotated_java_files.py | |
| parent | 2e2f4dee4a328a1c2f4ae138bbfe333bf8026741 (diff) | |
| parent | fc3762eb5fca80ace6ce9a6db34e81c5bba7f305 (diff) | |
am fc3762eb: am 2cb494ee: am c510037b: am ecdd89b8: am b472314a: am 34d183b4: Merge "Revert "Changes associated with an OkHttp bad proxy response fix"" into lollipop-cts-dev
* commit 'fc3762eb5fca80ace6ce9a6db34e81c5bba7f305':
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions