summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorAndroid Merger <android-build-merger@google.com>2017-03-14 05:33:29 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-03-14 05:33:30 +0000
commit25d9de02833c98cfb8fdf34e9a9f9464aa1900c2 (patch)
tree80e7a51238a68b111fc0be89dcb753be95e1d6a5 /annotations/generate_annotated_java_files.py
parent8d4ae0d328ff2f2461bd9ca99cd01199b114ae11 (diff)
parent5901f02e6fc9132ea892505302abe9aaa5fe047e (diff)
Merge "Merge "Remove StuckServer using backlog and tests relying on it" into marshmallow-cts-dev am: ffe8423f3b" into nougat-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions