diff options
| author | Neil Fuller <nfuller@google.com> | 2015-09-01 20:00:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 20:00:07 +0000 |
| commit | fc3762eb5fca80ace6ce9a6db34e81c5bba7f305 (patch) | |
| tree | 4a38d981fef0682951f25a6cbb588105046dd40e /annotations/generate_annotated_java_files.py | |
| parent | 4434066e2fc8595efb2308c5cbe6f6e8b96083aa (diff) | |
| parent | 2cb494ee8b7c162162fc390080bc8078380fe7da (diff) | |
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 '2cb494ee8b7c162162fc390080bc8078380fe7da':
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions