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

Trivial merge