diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-20 18:09:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-20 18:09:19 +0000 |
| commit | 95d95e2a08dac35bdfb812183595a673e1c0fe4b (patch) | |
| tree | f1e2fd205c2fb5df0ef2957b5ea2b7977986d7a7 /annotations/generate_annotated_java_files.py | |
| parent | 1a5c3e032b064c70a706acc09d022579522fb3b6 (diff) | |
| parent | aa4305ab7091d83dda277ee19b7497ca72a31e49 (diff) | |
Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours skipped: 71fc6b75a3 skipped: 145f724ad4 skipped: f109dbf6d3 am: e70b1a0864 -s ours am: 84846dc7e4 -s ours" into oc-mr1-dev am: 94c8571798 -s ours am: 79db781a13 -s ours am: c2378d7eb9 -s ours am: aa4305ab70 -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/+/1318271
Change-Id: I4577006770016f3a54f9590bde1f6b6f3591363a
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions