diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:53:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:53:19 +0000 |
| commit | 32d73dada730f0cfff45d4ded7fbcc8176b7120a (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | f8ef9e2c9c86aab687dccfbf6ca45560dfd2065d (diff) | |
| parent | f2b95ed48be2d5750f25a62248a600f0bcd9a684 (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
Change-Id: Id7148681d4c3711cc697ddc3fc2b1ec2927eed11
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions