diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 23:44:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 23:44:31 +0000 |
| commit | c96bc2018929fc90d5ba9dad39395b97c5e8c50b (patch) | |
| tree | d9a5a021a40216005c704aee4a55752915b781d8 /annotations/generate_annotated_java_files.py | |
| parent | d718b35915bc8e9be9ca0f1729d8ffe0b3bfe1b2 (diff) | |
| parent | c38f4c5a7a6c424c42715fd28d90446aa1134c7c (diff) | |
Merge "[automerger skipped] Merge "Merge "Track tzdb 2020a changes [N CTS branch]" into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours" into oreo-cts-dev am: 055b92daef -s ours am: c38f4c5a7a -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/+/1317311
Change-Id: Ie4544f4c35d6911c156381a1d21186ef7bada66e
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions