diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2020-06-25 23:57:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 23:57:36 +0000 |
| commit | a22282b7ff258633f6165ddd5e67d874599d0773 (patch) | |
| tree | 840924da66a82b6a7dbeb66fe6a58f37a9f9b64f /annotations/generate_annotated_java_files.py | |
| parent | eb5055f8bf3522fbc49871ea550b144d502af496 (diff) | |
| parent | 44c82db8f1844b02e1cb002763472df9ee919804 (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 skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 054315bd8e is in history
Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311
Change-Id: I7247da38bee4af0d240b288f6b7e5ee55e0f65e5
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions