diff options
| author | Android Merger <noreply-android-build-merger@google.com> | 2018-09-25 10:17:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-09-25 10:17:32 +0000 |
| commit | d731f01fe60708670b75506c56bb53c1f723ca1a (patch) | |
| tree | 74b7478669b75ca4a00621a55b48517ae9288952 /annotations/generate_annotated_java_files.py | |
| parent | 214945b954c9a2159148f89bb284f95c1cbcd004 (diff) | |
| parent | 119a08ce2705131defde3673ee9ece0369d4da74 (diff) | |
Merge "[automerger skipped] Merge "Merge "Allow some slop on socket time values" into oreo-cts-dev am: 5bb4ad5d54" into oreo-mr1-cts-dev am: fed6186c74 -s ours" into pie-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions