Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Thu, 20 Aug 2015 09:39:54 +0000 (11:39 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Thu, 20 Aug 2015 09:39:54 +0000 (11:39 +0200)
commitefce517f5ef69ac5a0d7741cdd38188895b41683
tree6c03ce5c63fd23a3414c30c7c6fe557a5cdb2b7b
parent6ce558c0333a4763ae11f57549a0a3925a209cf8
parent6219397371df39fd6f862d831705f54f9cf7dfaf
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab