aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-04-01 16:15:55 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-04-01 16:15:55 +0200
commit53605855ee747d4c20578a322629152b47bd08fe (patch)
tree75ecb570f16e746f3741ba3ead23ae32ce5d8d0d /OpenPGP-Keychain/src/main/res
parent7000ab37fda358b93ec89dd77b5b2b42c5ec6420 (diff)
parent247ad6207ae5489d6dfac73079ce5933415409a0 (diff)
downloadopen-keychain-53605855ee747d4c20578a322629152b47bd08fe.tar.gz
open-keychain-53605855ee747d4c20578a322629152b47bd08fe.tar.bz2
open-keychain-53605855ee747d4c20578a322629152b47bd08fe.zip
Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain
Diffstat (limited to 'OpenPGP-Keychain/src/main/res')
-rw-r--r--OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml
index eddbe3cbf..b8897a7b3 100644
--- a/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml
@@ -6,7 +6,7 @@
android:orientation="vertical" >
<LinearLayout
- android:id="@+android:id/text_layout"
+ android:id="@+id/text_layout"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"