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