summaryrefslogtreecommitdiff
path: root/include/ScopedJavaUnicodeString.h
diff options
context:
space:
mode:
authorTina Zhou <tinazh@google.com>2016-11-16 19:25:22 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-11-16 19:25:22 +0000
commitd51960b77ced835c91a7aa23f13aed5e19f50c57 (patch)
tree16645af7d82bae65fb435ff4a5fd279165d4579a /include/ScopedJavaUnicodeString.h
parentecf04699d50425eeeaa87e8661aad8c98a074dbe (diff)
parentf52b0572562c897f6cd7f66f10955d50ddf58f8d (diff)
Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff74 -s ours am: df85514873 -s ours
am: f52b057256 -s ours Change-Id: I0475b75cedd2e47b5a5e38e6e72837d1387884df
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions