diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-18 01:15:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-18 01:15:59 +0000 |
| commit | 2296f0a73fb503dc27bef464abc686f822ea2de8 (patch) | |
| tree | f2a06f5d94278abe39fcb6eb95caa2a7c0c2a88b /annotations/generate_annotated_java_files.py | |
| parent | 6d00d37b2fae468548f993a0a8a81b5225b15dae (diff) | |
| parent | 7871ce3f3bc26dc83440ce8a116c362678bf5c04 (diff) | |
Merge "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" into oreo-mr1-cts-dev am: a9cdeb3196 -s ours am: e97358223e -s ours am: eb5055f8bf -s ours am: 7871ce3f3b -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/+/1317311
Change-Id: I299424f822dcd6886169d23ddcf36a94a9dc9ea5
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions