diff options
| author | Yi Kong <yikong@google.com> | 2017-03-14 05:43:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-14 05:43:25 +0000 |
| commit | 85095182d0e8b63d6609471aaecea1d019d6cbfc (patch) | |
| tree | c5c7fbd6d4799fa0596457be03001ca714690297 /annotations/generate_annotated_java_files.py | |
| parent | 401086c13faff46a488e1b300608efaf974887b0 (diff) | |
| parent | fc23e67d29febdd7d285e489e5ac365f2040403b (diff) | |
Merge "Merge "Remove StuckServer using backlog and tests relying on it" into marshmallow-cts-dev am: ffe8423f3b" into nougat-cts-dev am: 25d9de0283
am: fc23e67d29
Change-Id: I83e4817e08c4b0b9ebbb399f60dad3b0a1b55f24
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions