diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:25:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:25:40 +0000 |
| commit | a7e9f27f1ef28d757d910d5161d686c8ea092a7c (patch) | |
| tree | 16645af7d82bae65fb435ff4a5fd279165d4579a /include/ScopedJavaUnicodeString.h | |
| parent | c14fd2a3664aedd08eec7a3ca568142188410561 (diff) | |
| parent | 2b20489d39d91c5ece907bd3c1d2e925be5cb44c (diff) | |
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
am: 2b20489d39 -s ours
Change-Id: I3949d2ee94d027ffb44c3fabba8d81a9c52eebfe
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions