am 238e0ac5: Merge "Fixed octal printing of bytearrays"

* commit '238e0ac56654afadb5270264660db7305f139c02': Fixed octal printing of bytearrays

am 238e0ac5: Merge "Fixed octal printing of bytearrays"
* commit '238e0ac56654afadb5270264660db7305f139c02': Fixed octal printing of bytearrays
a609653b · Max Cai · Android Git Automerger · 274705a9 · 04f70ef5 · a609653b
Commit a609653b authored Aug 29, 2014 by Max Cai Committed by Android Git Automerger Aug 29, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

MessageNanoPrinter.java ...ain/java/com/google/protobuf/nano/MessageNanoPrinter.java +1 -1

No files found.
--- a/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
+++ b/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
@@ -249,7 +249,7 @@ public final class MessageNanoPrinter {
            } else if (ch >= 32 && ch < 127) {
                builder.append((char) ch);
            } else {
-                builder.append(String.format("\\%03o", ch));
+                builder.append(String.format("\\%03o", ch && 0xff));
            }
        }
        builder.append('"');