Merge "Change time format for default clock in keyguard" into jb-mr2-dev
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/ClockView.java b/policy/src/com/android/internal/policy/impl/keyguard/ClockView.java
index 6c701c7..34bf6e7 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/ClockView.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/ClockView.java
@@ -42,7 +42,7 @@
 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;