Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
authorAndy Scherzinger <info@andy-scherzinger.de>
Wed, 19 Aug 2015 17:18:00 +0000 (19:18 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Wed, 19 Aug 2015 17:18:00 +0000 (19:18 +0200)
commitd83ca06e5182fc0cd4c9ce9eed153fa6319f896c
tree3e970770535c60ef755212b19a804284aef5be7d
parent7f13b98cc06723b129c7fff05fed188612a9f100
parent2ce3e2707a9bbe5c741df6d3fcd217dd867f9191
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons