summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2020-07-18 01:15:35 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-18 01:15:35 +0000
commit6d00d37b2fae468548f993a0a8a81b5225b15dae (patch)
treef2a06f5d94278abe39fcb6eb95caa2a7c0c2a88b /annotations/generate_annotated_java_files.py
parent958ae5517bb3574f995b5342a8cde1089a68f543 (diff)
parente10994eda237b18db4ff5f1e3c1cb62bf94bf523 (diff)
[automerger skipped] [automerger] Merge "Track tzdb 2020a changes [N CTS branch]" into nougat-cts-dev am: 27dfa1af40 am: f940c558b5 am: 7b8e53209f am: 68f384c726 am: 253022fb25 am: 40190e4698 am: e31a931447 -s ours am: 0695b8ab58 -s ours am: f421debad0 -s ours am: 99d4e29a38 -s ours am: e10994eda2 -s ours
am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: I6a5cd6e85a156a36f25946342a679473e8f5e0d4
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions