aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Cai <maxtroy@google.com>2015-03-20 23:15:12 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-20 23:15:12 +0000
commite72726879fac0251b48f910b9ec5adf241c75a53 (patch)
tree298bf379e2d05489ab6d5907221d22778bb1e885
parentb90a9c5e0e63897713837b067d92e61cbd24677c (diff)
parentd85ee8b8cda8cba35a28952f0de9186abc3422c5 (diff)
downloadexternal_protobuf-e72726879fac0251b48f910b9ec5adf241c75a53.zip
external_protobuf-e72726879fac0251b48f910b9ec5adf241c75a53.tar.gz
external_protobuf-e72726879fac0251b48f910b9ec5adf241c75a53.tar.bz2
am d85ee8b8: am 77866143: Merge "Revert "Fixed octal printing of bytearrays""
* commit 'd85ee8b8cda8cba35a28952f0de9186abc3422c5': Revert "Fixed octal printing of bytearrays"
-rw-r--r--java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java b/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
index ec12c7d..572a707 100644
--- 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 && 0xff));
+ builder.append(String.format("\\%03o", ch));
}
}
builder.append('"');