Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Wed, 9 Sep 2015 09:43:02 +0000 (11:43 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Wed, 9 Sep 2015 09:43:02 +0000 (11:43 +0200)
commitfb2ba72d43c3a73d44aaf78a30521898d1770629
treec35dc3c2005016416d03b842520b3877bad2f3c5
parent73378f55239878a7ff6fbbc3da6c7b3abd69f1ea
parent0234ca22ea2422f49cb453e8f3030a699cdd94bd
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab