diff options
| author |  Bo Yang <teboring@google.com> | 2016-09-19 13:45:07 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2016-10-10 11:23:36 -0700 |
| commit | cc8ca5b6a5478b40546d4206392eb1471454460d (patch) | |
| tree | c0b45abfa16d7d373a6ea8f7fe50f1de00ab938e /java/core/src/main/java/com/google/protobuf/RopeByteString.java | |
| parent | 337a028bb65ccca4dda768695950b5aba53ae2c9 (diff) | |
Integrate internal changes
Diffstat (limited to 'java/core/src/main/java/com/google/protobuf/RopeByteString.java')
| -rw-r--r-- | java/core/src/main/java/com/google/protobuf/RopeByteString.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/core/src/main/java/com/google/protobuf/RopeByteString.java b/java/core/src/main/java/com/google/protobuf/RopeByteString.java index 3f3e9bd1..6fa555df 100644 --- a/java/core/src/main/java/com/google/protobuf/RopeByteString.java +++ b/java/core/src/main/java/com/google/protobuf/RopeByteString.java @@ -406,6 +406,7 @@ final class RopeByteString extends ByteString { right.writeTo(output); } + @Override protected String toStringInternal(Charset charset) { return new String(toByteArray(), charset); |