Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 3 Aug 2015 19:39:27 +0000 (21:39 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 3 Aug 2015 19:39:27 +0000 (21:39 +0200)

Trivial merge