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

Trivial merge