diff options
| author | Kazuhiro Inaba <kinaba@google.com> | 2017-03-14 16:12:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-14 16:12:00 +0000 |
| commit | d1e1a26ff758f0dba45eae3c4ce4b400113bd8ec (patch) | |
| tree | d2153ee2b8bc76217e226f5270f6f1333fc60a22 /annotations/generate_annotated_java_files.py | |
| parent | d3e0e816ad3e59f81c492972d2d25d92a8412ddc (diff) | |
| parent | 07dc644ffc55de293d57c9ab2f9af0204c7d8326 (diff) | |
Merge "Merge "DO NOT MERGE: Revert "Remove StuckServer using backlog and tests relying on it"" into marshmallow-cts-dev am: 01db61a69c -s ours" into nougat-cts-dev am: 633eff7071 -s ours am: 09f53fa563
am: 07dc644ffc
Change-Id: I1bc64e73e64bf061556c74a7691b47c133e4b8c7
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions