Merge from gingerbread-plus-aosp

Change-Id: I154071687cdd51c28bb377ea3f1e818e96909b56
diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java
index 0c298b0..43d194f 100644
--- a/core/java/android/widget/NumberPicker.java
+++ b/core/java/android/widget/NumberPicker.java
@@ -111,7 +111,7 @@
     public static final NumberPicker.Formatter TWO_DIGIT_FORMATTER = new NumberPicker.Formatter() {
         final StringBuilder mBuilder = new StringBuilder();
 
-        final java.util.Formatter mFmt = new java.util.Formatter(mBuilder);
+        final java.util.Formatter mFmt = new java.util.Formatter(mBuilder, java.util.Locale.US);
 
         final Object[] mArgs = new Object[1];