Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad2f9ff7 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am 08e1b94c: Merge "Fix "p.m." in lockscreen (locale: es)." into froyo 

Merge commit '08e1b94c' into froyo-plus-aosp

* commit '08e1b94c':
  Fix "p.m." in lockscreen (locale: es).
parents d6d11517 08e1b94c

core/res/res/layout/keyguard_screen_tab_unlock.xml

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
        android:layout_below="@id/carrier"

        android:layout_marginTop="52dip"

        android:layout_marginLeft="20dip"

        android:layout_marginBottom="8dip"

        android:paddingBottom="8dip"

        >



        <TextView android:id="@+id/timeDisplay"

core/res/res/layout/keyguard_screen_tab_unlock_land.xml

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
            android:layout_height="wrap_content"

            android:layout_below="@id/carrier"

            android:layout_marginTop="56dip"

            android:layout_marginBottom="8dip"

            android:paddingBottom="8dip"

            >



            <TextView android:id="@+id/timeDisplay"

core/res/res/layout/keyguard_screen_unlock_landscape.xml

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
            android:layout_alignParentTop="true"

            android:layout_alignParentLeft="true"

            android:layout_marginTop="8dip"

            android:layout_marginBottom="8dip"

            android:paddingBottom="8dip"

            >



            <TextView android:id="@+id/timeDisplay"

core/res/res/layout/keyguard_screen_unlock_portrait.xml

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
            android:layout_alignParentTop="true"

            android:layout_marginTop="15dip"

            android:layout_marginLeft="20dip"

            android:layout_marginBottom="8dip"

            android:paddingBottom="8dip"

            >



            <TextView android:id="@+id/timeDisplay"