Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Wed, 19 Aug 2015 17:18:29 +0000 (19:18 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Wed, 19 Aug 2015 17:18:29 +0000 (19:18 +0200)
commit6ce558c0333a4763ae11f57549a0a3925a209cf8
treeeef96354303739ac4949baaa5b6087114ed4eec3
parent99e6db3d34f7f7498cc0d5bcc49fb3b7487511c1
parentd83ca06e5182fc0cd4c9ce9eed153fa6319f896c
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab