Merge remote-tracking branch 'origin/development' into linked-identities

This commit is contained in:
Vincent Breitmoser
2015-04-26 01:02:42 +02:00
3 changed files with 0 additions and 140 deletions

View File

@@ -5,8 +5,6 @@
android:layout_height="match_parent"
android:orientation="vertical">
<!--<include layout="@layout/decrypt_result_include" />-->
<LinearLayout
android:visibility="gone"
android:id="@+id/decrypt_text_valid"