diff options
| author | Yi Kong <yikong@google.com> | 2017-03-16 20:08:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-16 20:08:59 +0000 |
| commit | ac0463f3bd15b53b3b5a49120e46459124a03a11 (patch) | |
| tree | 2d40e0ee433e63e4bbbe4f3a5a0aa8f59082fa29 /annotations/generate_annotated_java_files.py | |
| parent | 2ab6d92de43c6eba1195c2c491e36dcb099b82ef (diff) | |
| parent | 8de6ec43d2a498f312e833b1ee8a28b7710ac28b (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
am: 8de6ec43d2 -s ours
Change-Id: I352f3c55b1092a5c50ccaee2d11eff0acbc2655c
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions