diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:17:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:17:28 +0000 |
| commit | 11169819942fc46f8f8d5bbbe654d97958af09d5 (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | e13041fe76e0a014c5802aa8d857e8fb3d77bd34 (diff) | |
| parent | 9e4db0d0c6c8247b6f93aa5ea14f997561aba4f5 (diff) | |
Merge "Merge "IDN: Fix handling of long domain names." into lollipop-mr1-cts-dev am: a0b160e5f3" into marshmallow-cts-dev am: bbec80932c am: 8179d66350
am: 9e4db0d0c6
Change-Id: I3c7a91a21cd33f258d91046c33bd90a76db77d48
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions