diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 23:24:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 23:24:31 +0000 |
| commit | 0f7f8e4235abb4cbb3bd6a3bbc26106c56acccb0 (patch) | |
| tree | 7cf0aa93710c08d62b4232767c9a0c8f47bd4549 /annotations/generate_annotated_java_files.py | |
| parent | cf3f518256c6ff7a8e47036a4375132b9c1caa82 (diff) | |
| parent | 2aeac88223ca47df24d6c27c43256e345768e6ce (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
am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 9b207b42dc is in history
Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311
Change-Id: I45700596f8353feee6096b9b8f762f19ae87aa0c
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions