diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-30 18:45:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-30 18:45:45 +0000 |
| commit | 31214c63cf50e0ffa293de21e012bf416e291145 (patch) | |
| tree | b730fe9dbc064dc6769ca174bc2462d40fa35ced /annotations/generate_annotated_java_files.py | |
| parent | b27a3fcb2951d2be43f7ea37ba865cab08c3b7b8 (diff) | |
| parent | 7c2d068af6e48e4180d36c65b76c4d36868eae13 (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 skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 054315bd8e is in history
Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271
Change-Id: I08a643f9ff855e53535a0765dd098deb8dbdc957
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions