Commit 2b20489d authored by Tina Zhou's avatar Tina Zhou Committed by android-build-merger
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
am: a1b430d8  -s ours

Change-Id: If8a835201427ff1583d2f5158d23bf582f3336b1
parents f52b0572 a1b430d8
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