summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-03-14 14:22:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-14 14:22:40 +0000
commitbd5e61fdee35d1adef260141fda9b203ac33f49a (patch)
treebcb556eb472efd375c42eb3539c639fe568d0003 /tools
parent6a02c9d89243d4f1171de187783b0769979a2723 (diff)
parentc0232642b74517aa2717673f0811ba65c620f491 (diff)
downloadframeworks_base-bd5e61fdee35d1adef260141fda9b203ac33f49a.zip
frameworks_base-bd5e61fdee35d1adef260141fda9b203ac33f49a.tar.gz
frameworks_base-bd5e61fdee35d1adef260141fda9b203ac33f49a.tar.bz2
am c0232642: am 629daddd: Merge "Fix layoutlib build."
* commit 'c0232642b74517aa2717673f0811ba65c620f491': Fix layoutlib build.
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java b/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java
index d40352f..998b08b 100644
--- a/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java
+++ b/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java
@@ -231,7 +231,7 @@ public class ICU_Delegate {
result.percent = '%';
result.perMill = '\u2030';
result.monetarySeparator = ' ';
- result.minusSign = '-';
+ result.minusSign = "-";
result.exponentSeparator = "e";
result.infinity = "\u221E";
result.NaN = "NaN";