Commit 2bc988eb 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 am: df855148  -s ours" into marshmallow-cts-dev
am: 78909a0a  -s ours

Change-Id: I4e1e18dc2a82a456b2c66845c80e394c03719f60
parents a5d8ba2b 78909a0a
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