Merge branch 'material_fab' of https://github.com/owncloud/android into target_marshm...
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 6 Nov 2015 11:03:16 +0000 (12:03 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 6 Nov 2015 11:03:16 +0000 (12:03 +0100)

Trivial merge