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