commit 2cf62473cac4347ffa293cb5f0dea4326b777509
author Elliott Hughes <enh@google.com> Mon Mar 01 10:26:01 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 01 10:26:01 2010 -0800
tree 8eb9fc51a793e5ac6506b47a34c57af97e6df305
parent 3c6af72b5f63b607b5f7b4cb87c1fc5a938412ec
parent 548ada6d5598559edd739015bb9f54fb5c2cbf20

am 16525029: Merge "Fix a FormatFlagsConversionMismatchException bug I introduced in Froyo."

Merge commit '165250293744f0aadcb0a0bfba1b53b8a4fb99b7' into dalvik-dev

* commit '165250293744f0aadcb0a0bfba1b53b8a4fb99b7':
  Fix a FormatFlagsConversionMismatchException bug I introduced in Froyo.

luni/src/main/java/java/util/Formatter.java

diff --git a/luni/src/main/java/java/util/Formatter.java b/luni/src/main/java/java/util/Formatter.java
index 12561e8..744df1f 100644
--- a/luni/src/main/java/java/util/Formatter.java
+++ b/luni/src/main/java/java/util/Formatter.java
@@ -1265,7 +1265,7 @@
             if (strFlags == null) {
                 strFlags = new StringBuilder(7); // There are seven possible flags.
             }
-            strFlags.append(ch);
+            strFlags.append((char) ch);
             return true;
         }