summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorAndroid Merger <noreply-android-build-merger@google.com>2018-09-25 10:12:59 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-09-25 10:12:59 +0000
commitfed6186c743607d4c2696cc27385a31567f63185 (patch)
treee45d26b643a92e042ac7117a5aa8b34abcde2bf3 /annotations/generate_annotated_java_files.py
parente7483acd9b0928a2506e786ec1df3fce2db87aad (diff)
parentbd3a07e07517fccaa5abcd4c4a2ae120ed7949de (diff)
Merge "Merge "Allow some slop on socket time values" into oreo-cts-dev am: 5bb4ad5d54" into oreo-mr1-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions