summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-06-16 11:10:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-16 11:10:00 +0000
commit97df96d8ebabd437db6a7691b8260bd51cf7f8d5 (patch)
tree46af828ffe8e46eec2b91d554a2c506a8349faa5 /core/java
parent617a4c403fc6b685203ffa43c8f4f4ef35a50eab (diff)
parent2ecc4dc88fc209f75f5dfe815d6a1fbb5fd49ef2 (diff)
downloadframeworks_base-97df96d8ebabd437db6a7691b8260bd51cf7f8d5.zip
frameworks_base-97df96d8ebabd437db6a7691b8260bd51cf7f8d5.tar.gz
frameworks_base-97df96d8ebabd437db6a7691b8260bd51cf7f8d5.tar.bz2
am 2ecc4dc8: am f36fe3f8: am 1083573c: Merge "Track changes to libcore ICU apis."
* commit '2ecc4dc88fc209f75f5dfe815d6a1fbb5fd49ef2': Track changes to libcore ICU apis.
Diffstat (limited to 'core/java')
-rwxr-xr-xcore/java/android/text/format/DateFormat.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/text/format/DateFormat.java b/core/java/android/text/format/DateFormat.java
index d1f35dd..9fec9a1 100755
--- a/core/java/android/text/format/DateFormat.java
+++ b/core/java/android/text/format/DateFormat.java
@@ -195,7 +195,7 @@ public class DateFormat {
* @return a string pattern suitable for use with {@link java.text.SimpleDateFormat}.
*/
public static String getBestDateTimePattern(Locale locale, String skeleton) {
- return ICU.getBestDateTimePattern(skeleton, locale.toString());
+ return ICU.getBestDateTimePattern(skeleton, locale);
}
/**