diff options
author | Neil Fuller <nfuller@google.com> | 2018-09-25 03:15:26 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-09-25 03:15:26 -0700 |
commit | a3700871f67c028beb627454e39c02dd912dde75 (patch) | |
tree | 691a0ba20eea142b4cc31996462a95c56b58830e /annotations/generate_annotated_java_files.py | |
parent | db52df1433827a820710c1a47c9f3394f93049ed (diff) | |
parent | 5bb4ad5d54ae0fdc13bb8b98a188cb40d1c4fb70 (diff) |
Merge "Allow some slop on socket time values" into oreo-cts-dev
am: 5bb4ad5d54
Change-Id: I6866de62463b94c34f29f72cd6f364c571d2d0c7
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions