Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
authorAndy Scherzinger <info@andy-scherzinger.de>
Thu, 20 Aug 2015 09:39:25 +0000 (11:39 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Thu, 20 Aug 2015 09:39:25 +0000 (11:39 +0200)
commit6219397371df39fd6f862d831705f54f9cf7dfaf
treee034c0333f879c0eb49426456b1afc2b6ca22009
parentd83ca06e5182fc0cd4c9ce9eed153fa6319f896c
parent8b55e8b35ca36ecb89f27853b3244401e03324a2
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons