diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-18 01:18:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-18 01:18:09 +0000 |
| commit | 5c6e1a6cfea075e673e8a5b8931b463098d49f5e (patch) | |
| tree | f2a06f5d94278abe39fcb6eb95caa2a7c0c2a88b /annotations/generate_annotated_java_files.py | |
| parent | aa4305ab7091d83dda277ee19b7497ca72a31e49 (diff) | |
| parent | ed303c8a3f38ced48afdb1215cf0f39e49f9c1af (diff) | |
Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev am: 6d7a838f06 -s ours am: 0181865f43 -s ours am: 887558033e -s ours am: b2a10d03b9 -s ours am: c06d07791e -s ours am: ed303c8a3f -s ours
am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history
Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271
Change-Id: Ia85e46d3b9b520de87245756f8e823549525cf7b
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions