Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Wed, 16 Sep 2015 14:31:10 +0000 (16:31 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Wed, 16 Sep 2015 14:31:10 +0000 (16:31 +0200)
Conflicts:
res/layout/list_item.xml


No differences found