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

Trivial merge