diff options
| author | Yi Kong <yikong@google.com> | 2017-03-16 20:11:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-16 20:11:28 +0000 |
| commit | 426fd9c48d7ea961fc004bcd6b96e6b84d60f81c (patch) | |
| tree | d2153ee2b8bc76217e226f5270f6f1333fc60a22 /annotations/generate_annotated_java_files.py | |
| parent | c4d2b7b0c5a38ca6f079f0c636db356154893c80 (diff) | |
| parent | 56551f050c47be7e2a97569390f3546331608fff (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
Change-Id: I68630ddbeb4535ba1a23d5fffc0aad897f5402bd
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions