Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 17 Aug 2015 14:14:12 +0000 (16:14 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 17 Aug 2015 14:14:12 +0000 (16:14 +0200)
commitc13741ba2056f175978ecdbc05b81cf473781e3d
tree1bdd39bea431457a48ce763dec49eb5e4a86ecf1
parentb669bd77374750484eb4b67e38899b643210e35b
parent3a82db451cfb855b7307d696214e51a02663f97b
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons