diff options
| author | Neil Fuller <nfuller@google.com> | 2018-09-25 03:27:15 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-09-25 03:27:15 -0700 |
| commit | 66203dce16da35ac4221edad464144c7750d7f4a (patch) | |
| tree | eb464827d582ffe9f6ac32e6212aabdd5a152f4d /annotations/generate_annotated_java_files.py | |
| parent | a925c17f4f41675c6f103586052ebff2a74e5d15 (diff) | |
| parent | 9bf5d8862c8198844c339d1950fe85fce4f5cbf3 (diff) | |
Merge "Allow some slop on socket time values" into oreo-cts-dev am: 5bb4ad5d54 am: a3700871f6
am: 9bf5d8862c
Change-Id: Idd92de1cd2517dd7c5113076b9a4a18f1cca64c8
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions