diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 20:00:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 20:00:55 +0000 |
| commit | 5c11ae3198c9241946084f3f6f1fe5d22b207772 (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | e732a0f6d07740bf55d94b19c2d581a999bee59c (diff) | |
| parent | 32d73dada730f0cfff45d4ded7fbcc8176b7120a (diff) | |
Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff74 -s ours am: df85514873 -s ours" into marshmallow-cts-dev am: 78909a0a70 -s ours am: 2bc988eb06 am: f2b95ed48b
am: 32d73dada7
Change-Id: I71e3431e047cc0483235d8da8cda88393d626f94
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions