diff options
| author | Android Merger <android-build-merger@google.com> | 2016-11-16 19:25:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-11-16 19:25:35 +0000 |
| commit | 20637ba37f77d2521413d0b549509c2d4397a94d (patch) | |
| tree | 16645af7d82bae65fb435ff4a5fd279165d4579a /include/ScopedJavaUnicodeString.h | |
| parent | f2faa4fc5d79920633800db1cfc8c3095f7b1994 (diff) | |
| parent | c14fd2a3664aedd08eec7a3ca568142188410561 (diff) | |
Merge "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" into nougat-cts-dev
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions