diff options
| author | Narayan Kamath <narayan@google.com> | 2016-11-16 19:25:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:25:03 +0000 |
| commit | ecf04699d50425eeeaa87e8661aad8c98a074dbe (patch) | |
| tree | 16645af7d82bae65fb435ff4a5fd279165d4579a /include/ScopedJavaUnicodeString.h | |
| parent | 2053dabc0cb5fdf051a9e7c282b3a417313898c8 (diff) | |
| parent | 361ff1784ec5f3f89b9050039044377afb9fd3c3 (diff) | |
Merge "Merge "DO NOT MERGE IDN: Fix handling of long domain names. am: bc48f87162 -s ours" into lollipop-mr1-cts-dev am: fcd60194c2 -s ours" into marshmallow-cts-dev
am: 361ff1784e -s ours
Change-Id: I4c19daf96f601ae93d90d6014c632d3d81c736b5
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions