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

Trivial merge