diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-20 18:24:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-20 18:24:02 +0000 |
| commit | 952683c154545c6ca4993b3015e9e14ed26c7b23 (patch) | |
| tree | f1e2fd205c2fb5df0ef2957b5ea2b7977986d7a7 /annotations/generate_annotated_java_files.py | |
| parent | a87549d0b22f648bbc1875f9bb30db1422215bec (diff) | |
| parent | 0418e20f9ade7b000bd103f1fc4333d458199da9 (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: 2296f0a73f -s ours am: 0418e20f9a -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: I61a081a926902aecd20e43ffce1b249a3a92c81c
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions