am dbd9c337: Merge "Change time format for default clock in keyguard" into jb-mr2-dev

* commit 'dbd9c337eddadccc04d4b4311261710ee38c23da':
  Change time format for default clock in keyguard
This commit is contained in:
Jim Miller
2013-04-02 17:29:14 -07:00
committed by Android Git Automerger

View File

@@ -42,7 +42,7 @@ import com.android.internal.R;
public class ClockView extends RelativeLayout {
private static final String ANDROID_CLOCK_FONT_FILE = "/system/fonts/AndroidClock.ttf";
private final static String M12 = "h:mm";
private final static String M24 = "kk:mm";
private final static String M24 = "HH:mm";
private Calendar mCalendar;
private String mFormat;