Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 6 Nov 2015 10:38:51 +0000 (11:38 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 6 Nov 2015 10:38:51 +0000 (11:38 +0100)
Conflicts:
res/layout/list_item.xml


No differences found