diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-05-11 22:23:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-11 22:23:59 +0000 |
| commit | 0fe04232158a2570e9b6e866ecd9a47353296ead (patch) | |
| tree | e5c9438a98c09f3c01fd58a3d72853c0de3c5473 /annotations/generate_annotated_java_files.py | |
| parent | 0b12fd220177e486e625ffc3f1433d5576a159ae (diff) | |
| parent | 2ddc778b9d0446e4265a491cddefd7931d86c68d (diff) | |
[automerger skipped] Merge "Track tzdb 2020a changes [O-MR1 CTS branch]" into oreo-mr1-cts-dev am: 9b27faeadb am: 73360a7a38 -s ours am: 6810c14ab2 -s ours am: 8cc6ab118d -s ours am: b0d56b3997 -s ours am: 2ddc778b9d -s ours
am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history
Change-Id: I1a65469c137cdfae93bca971da7df9025fb800bc
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions