diff options
| author | Yi Kong <yikong@google.com> | 2017-03-16 20:18:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-16 20:18:30 +0000 |
| commit | 44acc8249ac319c8e7c09e5fc138eb9a43cb06aa (patch) | |
| tree | d2153ee2b8bc76217e226f5270f6f1333fc60a22 /annotations/generate_annotated_java_files.py | |
| parent | 345e19571b697b8a7097a995b14f58a627e68b24 (diff) | |
| parent | 598d96485e86f2e7da6fa7b43162055c4e624e33 (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 am: ac0463f3bd am: f57c0c0782
am: 598d96485e
Change-Id: Id0dc33d863776c99362a2c354ddf780b9e0a7b30
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions