Commit f52b0572 authored by Tina Zhou's avatar Tina Zhou Committed by android-build-merger
Browse files

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

Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff  -s ours
am: df855148  -s ours

Change-Id: I3e2acd6f83304fb21b1515559cddda5b9553b23b
parents 548cad53 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