diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-18 21:16:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-05-18 21:16:08 +0000 |
| commit | 9ba7ea0b4c2d9222824216a59d1b5cee36f84911 (patch) | |
| tree | d0ffaba0760c9fcf370310c878e0c6f51ae2397f /annotations/generate_annotated_java_files.py | |
| parent | 9b27faeadb6e3a40951311ce2ad12b662e31a835 (diff) | |
| parent | cd54d2168b7180c4c3e66a9cbcf276190a48d64d (diff) | |
Merge changes from topic "am-15cb99cc4d4c429085be893ac571ecd0" into oreo-mr1-cts-dev
* changes:
[automerger skipped] Merge "Fix TestFormatter test for 2020a update [O CTS]" into oreo-cts-dev am: cf3f518256 -s ours
[automerger skipped] Merge "Track tzdb 2020a changes [O CTS branch]" into oreo-cts-dev am: fb11ba94ec -s ours
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions