diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2020-07-20 18:07:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-20 18:07:33 +0000 |
| commit | 49cd5e841722b5fb2b2abda81e2ab4cd20009e88 (patch) | |
| tree | f1e2fd205c2fb5df0ef2957b5ea2b7977986d7a7 /annotations/generate_annotated_java_files.py | |
| parent | 0418e20f9ade7b000bd103f1fc4333d458199da9 (diff) | |
| parent | 7840c06d8b9f834bbc05b0261bc4f933ef7e580d (diff) | |
[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 skipped: 6543d6ed08 skipped: a5a1744f72 skipped: 6ccb644512 am: c4e3a113a7 -s ours am: d718b35915 -s ours am: 44c82db8f1 -s ours am: a22282b7ff -s ours am: 4174ffabf2 -s ours am: 7840c06d8b -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: Idf471f67174d82e765746c583559890046c2ac3e
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions