summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-18 21:27:10 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-05-18 21:27:10 +0000
commit5b3d1347695551d2e571694efca0889b9676cdee (patch)
treeb730fe9dbc064dc6769ca174bc2462d40fa35ced /annotations/generate_annotated_java_files.py
parent75ac3930a5eeba1cb9e901971066c3a7be2134f3 (diff)
parent931d2eea8e70480a2f3f892ee2673662663e7b05 (diff)
Merge "[automerger skipped] Merge changes from topic "am-15cb99cc4d4c429085be893ac571ecd0" into oreo-mr1-cts-dev am: 9ba7ea0b4c -s ours" into pie-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions