summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2017-07-12 08:22:36 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-12 08:22:36 +0000
commit316340bb35dca427916f4be048bb99a18eeb81be (patch)
tree3a118aceb113cdd13399b5f5afd99fc4d828ca23 /annotations/generate_annotated_java_files.py
parent4361b903e17cbea585d200f3228e03b993737137 (diff)
parent0acc8b75d1a7a623ef54339b1d64a6ab068f5936 (diff)
Merge "Revert "Make ZipEntryTest time-insensitive"" am: 4a0e1e6839 am: d5b129b702 am: f1bd57c81f
am: 0acc8b75d1 Change-Id: I031ed0670ef21f3167d250ebd3a737524f38ced3
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions