summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-06-16 10:56:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-16 10:56:34 +0000
commitf36fe3f85daaf9e3b3270143d6648394768bb324 (patch)
treeb3177a0f4c1079ffef059c3b7cafb0330c98f85c /core/java
parent8382b0d3c6639ee0eeadec02983bfceaf5ba0a32 (diff)
parent1083573c2feb6677ae5627a9ee41f82a697e22d4 (diff)
downloadframeworks_base-f36fe3f85daaf9e3b3270143d6648394768bb324.zip
frameworks_base-f36fe3f85daaf9e3b3270143d6648394768bb324.tar.gz
frameworks_base-f36fe3f85daaf9e3b3270143d6648394768bb324.tar.bz2
am 1083573c: Merge "Track changes to libcore ICU apis."
* commit '1083573c2feb6677ae5627a9ee41f82a697e22d4': 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);
}
/**