Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 4 Aug 2015 10:49:28 +0000 (12:49 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 4 Aug 2015 10:49:28 +0000 (12:49 +0200)
commit3e87ca193dd87bb3377441967a70ea9903d802ff
treecc5af4e486e86d33f7fff457cbd10de88c840af1
parent3c78d4fcfbde357bf39f452b3442684e3c34f204
parent6698b2d5f109df7db935ff5e962a631167391076
Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar

Conflicts:
build.gradle