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

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

Merge "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" into marshmallow-cts-dev
am: 2a9d9de7  -s ours

Change-Id: I9e1631b0a449d17e02ff956b6a4fed432574c3a1
parents 94ac2d84 2a9d9de7
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