diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-30 19:00:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-30 19:00:34 +0000 |
| commit | c06d07791e8df7e042366648b02b145078395480 (patch) | |
| tree | 840924da66a82b6a7dbeb66fe6a58f37a9f9b64f /annotations/generate_annotated_java_files.py | |
| parent | 79db781a13d35dfff75c131e2cb77cbbd3dff717 (diff) | |
| parent | b2a10d03b9f4d074eaac5637c10bd43baeb7fb35 (diff) | |
Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev am: 6d7a838f06 -s ours am: 0181865f43 -s ours am: 887558033e -s ours am: b2a10d03b9 -s ours
am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 7275c92b32 is in history
Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271
Change-Id: Ie207678755d298fec3b9498e26863e573108486e
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions