diff options
| author | Kazuhiro Inaba <kinaba@google.com> | 2017-03-14 16:06:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-14 16:06:57 +0000 |
| commit | d3e0e816ad3e59f81c492972d2d25d92a8412ddc (patch) | |
| tree | d2153ee2b8bc76217e226f5270f6f1333fc60a22 /annotations/generate_annotated_java_files.py | |
| parent | 55d6c681d507bed525538ba1fa2e0691cd56b8ea (diff) | |
| parent | 4161d00731cd809496f8f8399089bc70482d75b1 (diff) | |
Merge "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" into nougat-mr1-cts-dev
am: 4161d00731 -s ours
Change-Id: I46a96b8768d3334820b832952a25c93cff95fb9c
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions