Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 15 Sep 2015 16:43:04 +0000 (18:43 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 15 Sep 2015 16:43:04 +0000 (18:43 +0200)
commitc1c7093486b8e3f9d3b3b18fd10d8e7e03a983f9
tree7ec3f86f14f3a6bb7d3ad83d1f2f84501d0d1932
parent8a43d9e9aa03191bab5d7f4a1a3729b63fca9b6a
parent6eccdc25b3e4ac9bb9c5686aa3e53f60ce07b59d
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab