summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-09-01 09:14:35 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-01 09:14:35 +0000
commitfc05c8f530a1febe75b87ab34ad34e66d2a22b38 (patch)
treeaf5137b6f0de47063e227ee8fcf44f99657c226b /annotations/generate_annotated_java_files.py
parenta11497034d07ff2ca3eb8fd0ed4e0b20da8e7e1b (diff)
parent383419e363bfefec5af672c47fba492312d61cd7 (diff)
am 383419e3: Merge "Changes associated with an OkHttp bad proxy response fix" into lmp-sprout-dev
* commit '383419e363bfefec5af672c47fba492312d61cd7': 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