diff options
| author | Kazuhiro Inaba <kinaba@google.com> | 2017-03-14 16:01:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-14 16:01:57 +0000 |
| commit | 09f53fa5637046e77d16cd2ba8d1e71ad4bcfc11 (patch) | |
| tree | 2d40e0ee433e63e4bbbe4f3a5a0aa8f59082fa29 /annotations/generate_annotated_java_files.py | |
| parent | e159748a19efa09a8d4f33607b7943b694d70efe (diff) | |
| parent | 633eff7071393ec5bf83571dc969ea9672fba840 (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
Change-Id: Ic419a19c33fe1be0210bf1b827a44687b85dcfd2
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions