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