Merge branch 'development' of github.com:open-keychain/open-keychain into development

This commit is contained in:
Dominik Schürmann
2014-10-08 17:32:41 +02:00
6 changed files with 19 additions and 30 deletions

View File

@@ -60,7 +60,6 @@
android:layout_height="wrap_content">
<TextView
android:id="@+id/label_my_key"
android:paddingLeft="8dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@@ -82,10 +81,10 @@
android:id="@+id/sign_key_upload_checkbox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:checked="false"
android:text="@string/label_send_key" />
android:text="@string/label_send_key"
android:paddingTop="12dp"
android:paddingBottom="12dp"/>
<View
android:layout_width="match_parent"