merge 1.0.x back into trunk

This commit is contained in:
Thialfihar
2010-06-30 19:59:33 +00:00
parent 933ec4f7b6
commit 16cea885e2
45 changed files with 21 additions and 32 deletions

View File

@@ -199,15 +199,15 @@
<Button
android:id="@+id/btn_reply"
android:text="@string/btn_reply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_height="fill_parent"
android:layout_weight="1"/>
<Button
android:id="@+id/btn_decrypt"
android:text="@string/btn_decrypt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="0dip"
android:layout_height="fill_parent"
android:layout_weight="1"/>
</LinearLayout>