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 | a1f58091fddf49da9b67680485a9fc83f66e040f (patch) | |
| tree | d2153ee2b8bc76217e226f5270f6f1333fc60a22 /annotations/generate_annotated_java_files.py | |
| parent | 8d592fa81846aea0d96797abcf211fbf7794c07e (diff) | |
| parent | d3e0e816ad3e59f81c492972d2d25d92a8412ddc (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
am: d3e0e816ad
Change-Id: I43a415f466c633f0a1be44567d7137b5642b7ce2
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions