Commit a1b430d8 authored by Android Merger's avatar Android Merger Committed by Gerrit Code Review
Browse files

Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into... 

Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff  -s ours" into lollipop-mr1-cts-dev
parents fcd60194 df855148
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment