diff options
| author | Elliott Hughes <enh@google.com> | 2014-10-28 04:39:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-28 04:39:24 +0000 |
| commit | 87ce99ca7243e4556a6cfe9f42cc51531301e979 (patch) | |
| tree | befac656dd782e3f955f772a24e61be402d266e8 /core/java/android/text | |
| parent | 9d9aac4cacce75b4847aebce0f019250dc3b4e93 (diff) | |
| parent | ced7ebdb1d522b4206e2048b278554ca841aeaba (diff) | |
| download | frameworks_base-87ce99ca7243e4556a6cfe9f42cc51531301e979.zip frameworks_base-87ce99ca7243e4556a6cfe9f42cc51531301e979.tar.gz frameworks_base-87ce99ca7243e4556a6cfe9f42cc51531301e979.tar.bz2 | |
am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24."
* commit 'ced7ebdb1d522b4206e2048b278554ca841aeaba':
Migrate off timeFormat12 and timeFormat24.
Diffstat (limited to 'core/java/android/text')
| -rwxr-xr-x | core/java/android/text/format/DateFormat.java | 2 |
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 9fec9a1..d48f551 100755 --- a/core/java/android/text/format/DateFormat.java +++ b/core/java/android/text/format/DateFormat.java @@ -216,7 +216,7 @@ public class DateFormat { */ public static String getTimeFormatString(Context context) { LocaleData d = LocaleData.get(context.getResources().getConfiguration().locale); - return is24HourFormat(context) ? d.timeFormat24 : d.timeFormat12; + return is24HourFormat(context) ? d.timeFormat_Hm : d.timeFormat_hm; } /** |