summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-11-04 14:07:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-04 14:07:37 +0000
commit390d972a2a09b9cf03024d91a53e224f91a88e6d (patch)
treeecbb40c14ca840573544a691c4661f7a205781f3
parent31ac5350615c2a1f8c01d354ab07768de999a400 (diff)
parent2b32e9ac55dc769211ce73d9140b7ec9f0a7f54d (diff)
downloadlibcore-390d972a2a09b9cf03024d91a53e224f91a88e6d.zip
libcore-390d972a2a09b9cf03024d91a53e224f91a88e6d.tar.gz
libcore-390d972a2a09b9cf03024d91a53e224f91a88e6d.tar.bz2
am 2b32e9ac: Merge "Use equals for comparing percent strings."
* commit '2b32e9ac55dc769211ce73d9140b7ec9f0a7f54d': Use equals for comparing percent strings.
-rw-r--r--luni/src/main/java/java/text/DecimalFormatSymbols.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/luni/src/main/java/java/text/DecimalFormatSymbols.java b/luni/src/main/java/java/text/DecimalFormatSymbols.java
index 85f71a6..9750e6d 100644
--- a/luni/src/main/java/java/text/DecimalFormatSymbols.java
+++ b/luni/src/main/java/java/text/DecimalFormatSymbols.java
@@ -189,7 +189,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
NaN.equals(obj.NaN) &&
patternSeparator == obj.patternSeparator &&
perMill == obj.perMill &&
- percent == obj.percent &&
+ percent.equals(obj.percent) &&
zeroDigit == obj.zeroDigit;
}