resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp

This commit is contained in:
Jim Miller
2009-11-18 00:36:32 -08:00
parent b039668155
commit 86103cd7db

View File

@@ -40,8 +40,7 @@
android:layout_alignParentTop="true"
android:layout_marginTop="6dip"
android:layout_alignParentRight="true"
android:layout_marginTop="16dip"
android:layout_marginRight="16dip"
android:layout_marginRight="8dip"
android:textAppearance="?android:attr/textAppearanceMedium"
/>