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-25 23:24:38 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-06-25 23:24:38 +0000
commit055b92daefca73df3d4922058969151720612eff (patch)
tree7cf0aa93710c08d62b4232767c9a0c8f47bd4549 /annotations/generate_annotated_java_files.py
parentcf3f518256c6ff7a8e47036a4375132b9c1caa82 (diff)
parent0f7f8e4235abb4cbb3bd6a3bbc26106c56acccb0 (diff)
Merge "[automerger skipped] Merge "Merge "Track tzdb 2020a changes [N CTS branch]" into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours" into oreo-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions