summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2018-09-25 03:20:44 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-09-25 03:20:44 -0700
commita925c17f4f41675c6f103586052ebff2a74e5d15 (patch)
treeeb464827d582ffe9f6ac32e6212aabdd5a152f4d /annotations/generate_annotated_java_files.py
parentbfe645e189552dd063122d42653373502fe17105 (diff)
parentfed6186c743607d4c2696cc27385a31567f63185 (diff)
Merge "Merge "Allow some slop on socket time values" into oreo-cts-dev am: 5bb4ad5d54" into oreo-mr1-cts-dev
am: fed6186c74 Change-Id: Icf37ca3cf05a26bee1ace6b85ca23c665fe603b7
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions