From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Mon, 17 Aug 2015 07:05:33 +0000 (+0200)
Subject: Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_... 
X-Git-Tag: beta-20151128~7^2~46
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/16a5bdc8d18beb35a2400daa20a0588f669dfa32?hp=--cc

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

16a5bdc8d18beb35a2400daa20a0588f669dfa32
diff --cc res/layout/drawer_list_item.xml
index 8e6e2382,8c106107..25415acc
--- a/res/layout/drawer_list_item.xml
+++ b/res/layout/drawer_list_item.xml
@@@ -41,10 -41,10 +41,10 @@@
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
          android:paddingLeft="22dp"
 -        android:paddingRight="16dp"
 +        android:paddingRight="@dimen/standard_margin"
          android:textColor="@color/drawerMenuTextColor"
          android:text="@string/app_name"
-         android:textStyle="bold"
+         android:textStyle="normal"
          android:layout_gravity="center_vertical"
          android:textSize="14sp"
          />