Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 18 Aug 2015 21:20:01 +0000 (23:20 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 18 Aug 2015 21:20:01 +0000 (23:20 +0200)
Conflicts:
res/layout-land/account_setup.xml
res/layout/account_setup.xml


No differences found