diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-05-11 20:08:40 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-11 20:08:40 +0000 |
commit | dc88387f4cbb1dc818793472e2b85be6c075fe36 (patch) | |
tree | e5c9438a98c09f3c01fd58a3d72853c0de3c5473 /annotations/generate_annotated_java_files.py | |
parent | 04356048e476203ed5bf06e99cfc00909d5aea1b (diff) | |
parent | ff52bde869ee19d280b76ef058f6842cd1043518 (diff) |
[automerger skipped] Merge "Track tzdb 2020a changes [P CTS]" into pie-cts-dev am: 44e797341b am: 373621018a am: 2920c96524 -s ours am: ff52bde869 -s ours
am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history
Change-Id: I241d80b2eadb15abfc97f9d43c3aa9bf337d3eb6
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions