Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 17 Aug 2015 14:04:17 +0000 (16:04 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 17 Aug 2015 14:04:17 +0000 (16:04 +0200)
commitb669bd77374750484eb4b67e38899b643210e35b
tree15782a5be62b34411dcb544d40ed4c1faddea59c
parent16a5bdc8d18beb35a2400daa20a0588f669dfa32
parent4ff231f25653bb6659fc2efa371a59b90e0c37a8
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
res/values/styles.xml