Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 17 Aug 2015 14:14:12 +0000 (16:14 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 17 Aug 2015 14:14:12 +0000 (16:14 +0200)

Trivial merge