From: Andy Scherzinger Date: Fri, 14 Aug 2015 15:45:22 +0000 (+0200) Subject: Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_... X-Git-Tag: beta-20151128~7^2~49 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a7859b4ab43cd597a745e9788c78b1cc5eb31d51?hp=a7859b4ab43cd597a745e9788c78b1cc5eb31d51 Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons Conflicts: res/layout/drawer.xml res/layout/drawer_list_item.xml res/values/styles.xml ---