Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
authorAndy Scherzinger <info@andy-scherzinger.de>
Thu, 13 Aug 2015 15:58:58 +0000 (17:58 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Thu, 13 Aug 2015 15:58:58 +0000 (17:58 +0200)
commitbbd529289cbef2d9e5ffed19fb012417d5ece946
treedc76b632cad915607982f7a5d23617480c9fd293
parentba3bc9cbfde0092d4971b7791861d8f78df90ff4
parentbac0fa5f28facdfc89dd45c5ba4b988b081c0fba
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons