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

Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f871 -s... 

Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f871  -s ours" into lollipop-mr1-cts-dev
parents a1203713 70bfafe6
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