diff options
| author | Android Merger <android-build-merger@google.com> | 2016-11-16 19:25:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-11-16 19:25:52 +0000 |
| commit | 90ca9b233c91f650da80a76835ae01a599e96190 (patch) | |
| tree | 16645af7d82bae65fb435ff4a5fd279165d4579a /include/ScopedJavaUnicodeString.h | |
| parent | 4b14a4e00831ad762b0bb8be56348d58c0d046a1 (diff) | |
| parent | 818934698a077a7f61e97197b3cfaa22a2dcecc4 (diff) | |
Merge "Merge "Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names." into lollipop-cts-dev am: 7c504bff74 -s ours" into lollipop-mr1-cts-dev am: a1b430d841 -s ours" into marshmallow-cts-dev am: 2a9d9de7ca -s ours" into nougat-cts-dev
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions