diff options
author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:09:13 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:09:13 +0000 |
commit | df85514873da8cd635b660e986527259397fd884 (patch) | |
tree | e6503f05ca69278a0237021a07cbbe2c922fc918 /include/ScopedJavaUnicodeString.h | |
parent | 70bfafe61c0bce1722bf6762854b7b9d4a17f4fe (diff) | |
parent | 7c504bff74a19ef41a7c12c8fcb80d8c2bf8f68a (diff) |
Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev
am: 7c504bff74 -s ours
Change-Id: I58a951810c97fba78e0bfe7c4c512f0e8d2dd641
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions