diff options
| author | Xin Li <delphij@google.com> | 2017-02-17 22:47:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-17 22:47:39 +0000 |
| commit | 7f606ec2c59ec5a9aa12d60803c3cb767d31b479 (patch) | |
| tree | 581e8160bc00aa08ae1a4a8920350a540a4d0802 /annotations/generate_annotated_java_files.py | |
| parent | d24900bf474b9be066ce807881007a7680d46676 (diff) | |
| parent | cff8403500a05db4e0c2bad01e0d5b75a8c48640 (diff) | |
Merge mirror-aosp-marshmallow-cts-dev revision 016c30e83ec00454f07c5def94682f820c54fb59 into mnc-dev. am: 120f270103 am: b7465ab17a am: 779a7f07c7 am: 31635f7fc5 am: e9650b7240
am: cff8403500
Change-Id: Iafee8e0d0d1dc8cd891c2bc068f10da691818740
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions