diff options
author | Xin Li <delphij@google.com> | 2017-02-17 22:51:40 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-02-17 22:51:40 +0000 |
commit | c891182b54bef7986a1f227620d54d2c31ef8101 (patch) | |
tree | 574f19a367943bfc82e23bcf905486fe26eb22a1 /annotations/generate_annotated_java_files.py | |
parent | e0874054acea0e164c4464d3bb82302df50e8e5c (diff) | |
parent | f7501c2940cf4eafadc3e31af5a84a5cef0a9340 (diff) |
Merge mirror-aosp-marshmallow-cts-dev revision 016c30e83ec00454f07c5def94682f820c54fb59 into mnc-dev. am: 120f270103 am: b7465ab17a am: 779a7f07c7 am: 31635f7fc5 am: e9650b7240 am: cff8403500 am: 7f606ec2c5
am: f7501c2940
Change-Id: I6e01b637846f1eb98e73b80d822ea4db3801e686
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions