From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Fri, 6 Nov 2015 10:38:51 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons
X-Git-Tag: beta-20151128~7^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c31f602fd19cac136032a3e02852f62be21aa489

Merge branch 'master' of https://github.com/owncloud/android into material_buttons

Conflicts:
	res/layout/list_item.xml
---

c31f602fd19cac136032a3e02852f62be21aa489
diff --cc res/layout/list_item.xml
index 71efa7d7,076ed7b7..cf09502e
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@@ -81,8 -78,8 +81,8 @@@
                  android:ellipsize="middle"
                  android:singleLine="true"
                  android:text="TextView"
-                 android:textColor="#303030"
+                 android:textColor="@color/textColor"
 -                android:textSize="16dip" />
 +                android:textSize="@dimen/two_line_primary_text_size" />
  
              <LinearLayout
                  android:layout_width="match_parent"