diff options
| author | Android Merger <android-build-merger@google.com> | 2017-03-16 20:03:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-03-16 20:03:34 +0000 |
| commit | 8de6ec43d2a498f312e833b1ee8a28b7710ac28b (patch) | |
| tree | 1a7cd73e496077eaade6381950e220c447a9137b /annotations/generate_annotated_java_files.py | |
| parent | b13f7506e450cbb0aec1cdf94f7ad8425073dce7 (diff) | |
| parent | 9a257719a8df8fa3db9505f80014b991fb470451 (diff) | |
Merge "Merge "DO NOT MERGE: Remove StuckServer using backlog and tests relying on it" into marshmallow-cts-dev am: 244e7d3556 -s ours" into nougat-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions