diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2020-07-20 18:47:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-20 18:47:55 +0000 |
| commit | ac54cc11328fedfa82e12e53105c04872c40d544 (patch) | |
| tree | f1e2fd205c2fb5df0ef2957b5ea2b7977986d7a7 /annotations/generate_annotated_java_files.py | |
| parent | c15a9a9240590d4c5433b2cd5236866e62fbc072 (diff) | |
| parent | a87549d0b22f648bbc1875f9bb30db1422215bec (diff) | |
[automerger skipped] [automerger] Merge "Track tzdb 2020a changes [N CTS branch]" into nougat-cts-dev am: 27dfa1af40 am: f940c558b5 am: 7b8e53209f am: 68f384c726 am: 253022fb25 am: 40190e4698 am: e31a931447 -s ours am: 0695b8ab58 -s ours am: f421debad0 -s ours am: 99d4e29a38 -s ours am: e10994eda2 -s ours am: 6d00d37b2f -s ours am: 4fd49e40a1 -s ours am: a87549d0b2 -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: Ia2a52418cf4036f01b68ce6a7f1ca0a57913d301
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions