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