Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 8 Sep 2015 11:51:21 +0000 (13:51 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 8 Sep 2015 11:51:21 +0000 (13:51 +0200)

Trivial merge