diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 23:57:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 23:57:54 +0000 |
| commit | 3b87c238dfdfff06ab11a3e980ed7dd9900346f9 (patch) | |
| tree | 840924da66a82b6a7dbeb66fe6a58f37a9f9b64f /annotations/generate_annotated_java_files.py | |
| parent | a22282b7ff258633f6165ddd5e67d874599d0773 (diff) | |
| parent | a3107e916da4a4faa6034471d86f6b09885f8cae (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: c96bc20189 -s ours am: a3107e916d -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: Ie8dac2377420fad5fee709e0cd9fdd15e09ecece
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions