diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-20 18:50:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-20 18:50:09 +0000 |
| commit | 3ac21b6c5dcfe3574dd9ceb7c4002bb4146b150f (patch) | |
| tree | f1e2fd205c2fb5df0ef2957b5ea2b7977986d7a7 /annotations/generate_annotated_java_files.py | |
| parent | 4d8b44c2da8eb15eea6b12c450436e596a0cfb93 (diff) | |
| parent | 476f4f9d80c805a44291a577ddbcbd74cd2351a1 (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: 3b87c238df -s ours am: c68b65f522 -s ours am: 7fcaaa56ef -s ours am: 59cf43c5bd -s ours am: 476f4f9d80 -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: Ib87e0147a270a0715a4677f9654099136d7c1000
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions