diff options
| author | Neil Fuller <nfuller@google.com> | 2018-09-25 03:27:25 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-09-25 03:27:25 -0700 |
| commit | 72483d7cd58fe7e0d2f737ff4a8578cb24e9a718 (patch) | |
| tree | d61a52c3cff0a5b67606415492275c0f19495b6c /annotations/generate_annotated_java_files.py | |
| parent | df7da491aa02a344d0cc79e0c284416e2bfca1b2 (diff) | |
| parent | a925c17f4f41675c6f103586052ebff2a74e5d15 (diff) | |
[automerger skipped] Merge "Merge "Allow some slop on socket time values" into oreo-cts-dev am: 5bb4ad5d54" into oreo-mr1-cts-dev am: fed6186c74
am: a925c17f4f -s ours
Change-Id: If4af96af0145860a8dbdc0a3bd9955dadfe68c66
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions