commit ad71aa2046502db784a8c861b30b11ddf88044f1
author Jesse Wilson <jessewilson@google.com> Mon Mar 01 10:21:05 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 01 10:21:05 2010 -0800
tree 69e6369165cae3086f6e166fcaefa08bd3f81709
parent 165250293744f0aadcb0a0bfba1b53b8a4fb99b7
parent 21d27c095fee51fd6eac6a68d50b79df4dc97d85

Merge "New implementation for DOMConfiguration."

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

diff --git a/libcore/luni/src/main/java/java/util/Formatter.java b/libcore/luni/src/main/java/java/util/Formatter.java
index 12561e8..744df1f 100644
--- a/libcore/luni/src/main/java/java/util/Formatter.java
+++ b/libcore/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;
         }
 

vm/Dvm.mk

diff --git a/vm/Dvm.mk b/vm/Dvm.mk
index 1504a02..baf41c6 100644
--- a/vm/Dvm.mk
+++ b/vm/Dvm.mk
@@ -290,11 +290,6 @@
 
 ifeq ($(dvm_arch),x86)
   ifeq ($(dvm_os),linux)
-
-# TODO: Remove this once build core defines a default arch variant for x86
-    ifneq ($(dvm_arch_variant),x86-atom)
-        dvm_arch_variant := x86
-    endif
     MTERP_ARCH_KNOWN := true
     LOCAL_SRC_FILES += \
 		arch/$(dvm_arch_variant)/Call386ABI.S \