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:52:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-18 21:52:50 +0000
commit6fc30a190b772207c27102e9bbebe727365c2d7a (patch)
treef2a06f5d94278abe39fcb6eb95caa2a7c0c2a88b /annotations/generate_annotated_java_files.py
parent70b1308c7e57c7fc6c1743507fe5f4670861221e (diff)
parentbb2a72f846cd6207617157766836b3b6eae95dd0 (diff)
[automerger skipped] Merge changes from topic "am-15cb99cc4d4c429085be893ac571ecd0" into oreo-mr1-cts-dev am: 9ba7ea0b4c -s ours am: e702655798 -s ours am: bb2a72f846 -s ours
am skip reason: Change-Id If6a2dbb615a70739350cbae91cc33754afe2b793 with SHA-1 044bd5e685 is in history Change-Id: Ifd13ed83dd8f2b68ca761d6e395f3d4add02199f
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions