diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-20 18:26:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-20 18:26:47 +0000 |
| commit | 5b82429876c52d144223fe5e10b2d24db81cb35a (patch) | |
| tree | f1e2fd205c2fb5df0ef2957b5ea2b7977986d7a7 /annotations/generate_annotated_java_files.py | |
| parent | d8319d72f5c29ffe78771ffcfa5b494ddfb6a8a5 (diff) | |
| parent | bc5b27323292ac1f8352105fe9fb7adfca16a5da (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: 5c6e1a6cfe -s ours am: bc5b273232 -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: I761262b962dd5d73ecd1dc9b87140234cc38b29b
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions