diff options
| author | Narayan Kamath <narayan@google.com> | 2016-11-16 20:00:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 20:00:19 +0000 |
| commit | 5802c763025925f9f5c5bbd12c3721160e6305cd (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | 69d0db26298766a2dda48645d1fac7aa70dfc99a (diff) | |
| parent | b5edbceff52f74ae573afbc4a7b11707e3d48757 (diff) | |
Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f87162 -s ours" into lollipop-mr1-cts-dev am: fcd60194c2 -s ours" into marshmallow-cts-dev am: 361ff1784e -s ours am: 4a8df64b10 am: ff30dfee79
am: b5edbceff5
Change-Id: I9b3a7213596c73844ce78bc6ef5997c295c2ca70
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions