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