summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-05-09 16:01:54 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-09 16:01:54 -0700
commitdde61414ce1cd30587d9290b026a2a2c12da725f (patch)
treefcc6bba616b257eb407c896d7f69e66f745b0c78 /annotations/generate_annotated_java_files.py
parentc4944aa5ef86b3af41886fc82f562b7cfa68296b (diff)
parente49e2d3253c133499c2ba5d6c6d2b9f27da36920 (diff)
[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.
am: e49e2d3253 -s ours am skip reason: subject contains skip directive Change-Id: Ie7f5970d2fd3bf3ec030fdfa41a19f7153156fd8
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions