Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Sun, 27 Sep 2015 19:58:49 +0000 (21:58 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Sun, 27 Sep 2015 19:58:49 +0000 (21:58 +0200)
commit6a192340bbfb06540043819dc3c8c9f5911020fe
tree964fb9aadce5a8f2ef30da20c6716b7285d44ccd
parent0106a8174b07a830602d9a76e7c5747c08b45de3
parent5417b2a4e5114686aa1f9fadb55a6d464947acb8
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab