diff options
| author | Kazuhiro Inaba <kinaba@google.com> | 2017-03-14 16:16:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-14 16:16:39 +0000 |
| commit | 51a193b18dfaff248e1cd87f1d3043f65256ed0d (patch) | |
| tree | d2153ee2b8bc76217e226f5270f6f1333fc60a22 /annotations/generate_annotated_java_files.py | |
| parent | a1f58091fddf49da9b67680485a9fc83f66e040f (diff) | |
| parent | d1e1a26ff758f0dba45eae3c4ce4b400113bd8ec (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
am: d1e1a26ff7
Change-Id: I9795a50ab53c30921a899ce8faddc378ea7926b3
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions