diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-05-18 22:07:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-18 22:07:22 +0000 |
| commit | d4b8ff55baac965c1c97fe5dbb11da6cba72c130 (patch) | |
| tree | 840924da66a82b6a7dbeb66fe6a58f37a9f9b64f /annotations/generate_annotated_java_files.py | |
| parent | bb2a72f846cd6207617157766836b3b6eae95dd0 (diff) | |
| parent | a759493e9b2b8ba83076d2375f5164b738ff4814 (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 skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 9b207b42dc is in history
Change-Id: Ibd1efc1565370d2278a412df27e9a41031969594
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions