diff options
| author | Yi Kong <yikong@google.com> | 2017-03-14 05:38:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-14 05:38:27 +0000 |
| commit | fc23e67d29febdd7d285e489e5ac365f2040403b (patch) | |
| tree | 2d40e0ee433e63e4bbbe4f3a5a0aa8f59082fa29 /annotations/generate_annotated_java_files.py | |
| parent | 178765fe3af0fc62cc5fa9bbc001d25e3af805da (diff) | |
| parent | 25d9de02833c98cfb8fdf34e9a9f9464aa1900c2 (diff) | |
Merge "Merge "Remove StuckServer using backlog and tests relying on it" into marshmallow-cts-dev am: ffe8423f3b" into nougat-cts-dev
am: 25d9de0283
Change-Id: Ib1883ed41f1fa0477f1497e0b35c0bb0bb3afa53
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions