summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-05-11 22:09:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-11 22:09:54 +0000
commit2ddc778b9d0446e4265a491cddefd7931d86c68d (patch)
treee5c9438a98c09f3c01fd58a3d72853c0de3c5473 /annotations/generate_annotated_java_files.py
parent57b76740998bf75dc2e037fd2a863157682d41a6 (diff)
parentb0d56b39976b4fccfb5a4131b38c0f7d25afc861 (diff)
[automerger skipped] Merge "Track tzdb 2020a changes [O-MR1 CTS branch]" into oreo-mr1-cts-dev am: 9b27faeadb am: 73360a7a38 -s ours am: 6810c14ab2 -s ours am: 8cc6ab118d -s ours am: b0d56b3997 -s ours
am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Change-Id: Ibe2b2c9e82b5ad269917e08b75be24fc17670ec4
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions