Commit 78909a0a 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 am: df855148  -s ours" into marshmallow-cts-dev
parents 361ff178 f52b0572
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