diff options
| author | Yi Kong <yikong@google.com> | 2017-03-16 20:18:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-16 20:18:02 +0000 |
| commit | d491721f31399f5e6739cb077517d34f1b700bb2 (patch) | |
| tree | ffe4b825f8e12c68c4c4791cd519886e972acbe2 /annotations/generate_annotated_java_files.py | |
| parent | 9306223bcb0259a6ac97c452c0b105fdf9dc9869 (diff) | |
| parent | 345e19571b697b8a7097a995b14f58a627e68b24 (diff) | |
Merge "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 am: 8de6ec43d2 -s ours" into nougat-mr1-cts-dev am: 56551f050c -s ours am: 426fd9c48d
am: 345e19571b
Change-Id: Ibf39cb5ee96d5f0b02d75093dec2024a68a1a4ba
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions