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