diff options
| author | Xin Li <delphij@google.com> | 2017-02-17 22:42:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-17 22:42:08 +0000 |
| commit | 31635f7fc529e52ba8b40698768c7ac69613151b (patch) | |
| tree | 748b33c024cffb9ed906de784d1c6c1745a77e48 /annotations/generate_annotated_java_files.py | |
| parent | 71dc66cdea1a52cd9a9498a8351a5c0df2b94dfc (diff) | |
| parent | 779a7f07c7ece7ec0ff36469bf333d023fb1bd21 (diff) | |
Merge mirror-aosp-marshmallow-cts-dev revision 016c30e83ec00454f07c5def94682f820c54fb59 into mnc-dev. am: 120f270103 am: b7465ab17a
am: 779a7f07c7
Change-Id: I15367feb83ef4332b06589889b4e05ef8d5cc582
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions