diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-05-11 21:55:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-11 21:55:54 +0000 |
| commit | b0d56b39976b4fccfb5a4131b38c0f7d25afc861 (patch) | |
| tree | f2a06f5d94278abe39fcb6eb95caa2a7c0c2a88b /annotations/generate_annotated_java_files.py | |
| parent | d6378f4723a2ff50b9fe6459a7f8a84b289dc4bd (diff) | |
| parent | 8cc6ab118de908da7250cabd7bd0e8b0b1288602 (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 skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history
Change-Id: Idb21dee52f3d244e5f51d6e3b27549cb94307bdf
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions