diff options
| author | Kazuhiro Inaba <kinaba@google.com> | 2017-03-14 16:16:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-14 16:16:30 +0000 |
| commit | 4e73063f760fe1450f05cfc4b6b107e1c608cad1 (patch) | |
| tree | ffe4b825f8e12c68c4c4791cd519886e972acbe2 /annotations/generate_annotated_java_files.py | |
| parent | c0486afde0be668ba4fb910ef1c4b500b484579b (diff) | |
| parent | a1f58091fddf49da9b67680485a9fc83f66e040f (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
am: a1f58091fd
Change-Id: I2a904f95a6408b333eac9f5cb729e508cad9acb4
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions