Commit df855148 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 lollipop-cts-dev 

am: 7c504bff  -s ours

Change-Id: I58a951810c97fba78e0bfe7c4c512f0e8d2dd641
parents 70bfafe6 7c504bff
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