summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-05-18 22:18:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-18 22:18:54 +0000
commit5f2a9c03f57252d21468da5183f2fb494f40467b (patch)
treef2a06f5d94278abe39fcb6eb95caa2a7c0c2a88b /annotations/generate_annotated_java_files.py
parent6fc30a190b772207c27102e9bbebe727365c2d7a (diff)
parentd4b8ff55baac965c1c97fe5dbb11da6cba72c130 (diff)
[automerger skipped] Merge "Track tzdb 2020a changes [O CTS branch]" into oreo-cts-dev am: fb11ba94ec am: f2b6f433a5 am: ea4e9bc5d2 -s ours am: a759493e9b -s ours am: d4b8ff55ba -s ours
am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 9b207b42dc is in history Change-Id: Ia3f7f999fc1874205eb7013c53ce8a23d14f08a8
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions