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

Commit bcfc4500 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'froyo' into froyo-release

parents d95349ec 8a8658a5

NOTICE

+10 −0
Original line number Diff line number Diff line
@@ -41,6 +41,16 @@ The Apache Software Foundation (http://www.apache.org/). 
   =========================================================================



These files are Copyright 2007 Nuance Communications, but released under

the Apache2 License.



   =========================================================================

   ==  NOTICE file corresponding to the section 4 d of                    ==

   ==  the Apache License, Version 2.0,                                   ==

   ==  in this case for the Media Codecs code.                            ==

   =========================================================================



Media Codecs

These files are Copyright 1998 - 2009 PacketVideo, but released under

the Apache2 License.



                               Apache License

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"