archive/conversations
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

Browse source 
Conflicts:
	build.gradle
This commit is contained in:
steckbrief 2016-03-08 23:34:56 +01:00
commit 07c2aba59b
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/res/layout/dialog_userdecision.xml
View file

@ -9,7 +9,8 @@
android:layout_height="32dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="Medium Text"
android:id="@+id/dlgUserDecQuestion" />
android:id="@+id/dlgUserDecQuestion"
android:layout_marginLeft="8dp" />
<CheckBox
android:layout_width="match_parent"