diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-30 18:32:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-06-30 18:32:47 +0000 |
| commit | 7c2d068af6e48e4180d36c65b76c4d36868eae13 (patch) | |
| tree | d0ffaba0760c9fcf370310c878e0c6f51ae2397f /annotations/generate_annotated_java_files.py | |
| parent | a9cdeb3196287fbbbf25220bb42275fd49f546a0 (diff) | |
| parent | bb296280bedb4a66ffa33eeb1b1ac99fd9ba98fb (diff) | |
Merge "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" into oreo-mr1-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions