diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-05-11 21:22:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-11 21:22:21 +0000 |
commit | 6810c14ab24a9ab6d8a8a11d8274a7ba90330e51 (patch) | |
tree | 840924da66a82b6a7dbeb66fe6a58f37a9f9b64f /annotations/generate_annotated_java_files.py | |
parent | da5eb09a6d5abd5c5825931719dc2b37964f51d8 (diff) | |
parent | 73360a7a38fdd2f5d27d579bfefab4ee98d2200e (diff) |
[automerger skipped] Merge "Track tzdb 2020a changes [O-MR1 CTS branch]" into oreo-mr1-cts-dev am: 9b27faeadb am: 73360a7a38 -s ours
am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 f3fdba62c3 is in history
Change-Id: Iafb46e082b8e97e38362cf84a8bababb0ba192d9
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions