Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Sun, 6 Sep 2015 18:50:47 +0000 (20:50 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Sun, 6 Sep 2015 18:50:47 +0000 (20:50 +0200)
commit875c652bd5c5722489f00eaab524bb0d06d66def
treed4c0a6b3bda9414f9bb703fcc8350963215d905a
parentcd5e603f77b6286f808c5af02d426b803ee3c21c
parentc1e73ec56f341a26d480c5ffe231d871bee1a86d
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab