summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-30 18:20:45 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-06-30 18:20:45 +0000
commit6d7a838f06d60bddefdf7e623a820885dae70499 (patch)
tree7cf0aa93710c08d62b4232767c9a0c8f47bd4549 /annotations/generate_annotated_java_files.py
parent055b92daefca73df3d4922058969151720612eff (diff)
parentad441655fca3e6d6ea1c223f35fbbdcdb1de3b42 (diff)
Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions