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 23:55:07 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-18 23:55:07 +0000
commit6a063b523f35e67f7b7d35a1f90b11c71e769eb4 (patch)
treee5c9438a98c09f3c01fd58a3d72853c0de3c5473 /annotations/generate_annotated_java_files.py
parent239096cde30c478bdaf407b2ed247ec746619725 (diff)
parent507986de6ea743e9e4e29b28b83dd6718e653e60 (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: 6fc30a190b -s ours am: 780c19eb99 -s ours am: 507986de6e -s ours
am skip reason: Change-Id If6a2dbb615a70739350cbae91cc33754afe2b793 with SHA-1 044bd5e685 is in history Change-Id: Ibc6bc4dda73826de7ae02add4235dc74a10ee96c
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions