Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Thu, 20 Aug 2015 11:51:14 +0000 (13:51 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Thu, 20 Aug 2015 11:51:14 +0000 (13:51 +0200)
commit0d2aa0a97caa78428d8437b4959c0f9b50b793b7
treefe24cc0e5051d04b910dd0339ed2a72ae01aa52c
parentefce517f5ef69ac5a0d7741cdd38188895b41683
parentd24b396d54ffd926c18cfb13687de3164ca80bc5
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab