summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2017-02-21 19:15:31 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-21 19:15:31 +0000
commit54772e800adc4666ac935003cb5db07cd1cdbe19 (patch)
treeff55d78f7911efdcd51d56637c714399aae1b8a2 /annotations/generate_annotated_java_files.py
parent601353fae8c94bfc80b3514b462e6902353046b9 (diff)
parentcb2b4a6848b9730fc0f357b36379086d491559f5 (diff)
Merge "Test fix: Handle missing dummy0 network interface" into nougat-mr1-cts-dev
am: cb2b4a6848 Change-Id: Idf9eb508a076cc39364a92c3fb6360c77ff5ea5b
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions