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