Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 10 Aug 2015 11:02:16 +0000 (13:02 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 10 Aug 2015 11:02:16 +0000 (13:02 +0200)
commitdde5e5575cd7358ebed3390ca384e78bf9e3d17b
tree52cb29f44633ca5174001f44a65919ec49a051e4
parent275028a5e33e0ca7fd9901c4649939bad66311c4
parent64ebb2c1d3b729e087cc7f4337be4f02f18f2d91
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_toolbar