diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-05-18 22:32:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-18 22:32:16 +0000 |
| commit | 987368ecdcb03cb8949998b4a3a8eec3004288f1 (patch) | |
| tree | e5c9438a98c09f3c01fd58a3d72853c0de3c5473 /annotations/generate_annotated_java_files.py | |
| parent | 507986de6ea743e9e4e29b28b83dd6718e653e60 (diff) | |
| parent | da2bfdc9dd5bce1ada9d55bf3fc0a19871bcc6a8 (diff) | |
[automerger skipped] Merge "Track tzdb 2020a changes [O CTS branch]" into oreo-cts-dev am: fb11ba94ec am: f2b6f433a5 am: ea4e9bc5d2 -s ours am: a759493e9b -s ours am: d4b8ff55ba -s ours am: 5f2a9c03f5 -s ours am: da2bfdc9dd -s ours
am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history
Change-Id: I82d30db2332af3ace8b9629d5955f60da3df1373
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions