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)
commit69833ca31821cd29870095422ec72880952cb4f6
tree595844d417110bd06e5aed151825e19ca58d4b4c
parentdee90c9770ee092c750dee6d9b445a130a5b14a1
parent080a8ab7af2bc48e3c5fa1334ae91d21073e26c2
Merge branch 'material_fab' of https://github.com/owncloud/android into target_marshmallow