diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:25:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:25:23 +0000 |
| commit | c14fd2a3664aedd08eec7a3ca568142188410561 (patch) | |
| tree | 16645af7d82bae65fb435ff4a5fd279165d4579a /include/ScopedJavaUnicodeString.h | |
| parent | d51960b77ced835c91a7aa23f13aed5e19f50c57 (diff) | |
| parent | 78909a0a706aac3cbd28ede48070ec655e93e6f7 (diff) | |
Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff74 -s ours am: df85514873 -s ours" into marshmallow-cts-dev
am: 78909a0a70 -s ours
Change-Id: Ib21207194c7c94906f91b108333a10bc9cf563d6
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions