diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-18 01:17:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-18 01:17:36 +0000 |
| commit | e9ae827d5427a32ce86de0b99ce094455fdbf310 (patch) | |
| tree | f2a06f5d94278abe39fcb6eb95caa2a7c0c2a88b /annotations/generate_annotated_java_files.py | |
| parent | 7fcaaa56efaa5740577cbe703d95bd28f45ea439 (diff) | |
| parent | bb39e4db98ca20f2b32350319c2cafdb4f65a9f8 (diff) | |
Merge "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" into oreo-mr1-cts-dev am: 7c2d068af6 -s ours am: 4ecb654da9 -s ours am: 83d01084b9 -s ours am: bb39e4db98 -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: I5f0f29cbcddd9314dc5117c1e261806839512ba4
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions