Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 10 Aug 2015 09:19:23 +0000 (11:19 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 10 Aug 2015 09:19:23 +0000 (11:19 +0200)
commit456647c99618e517cdd7c18727e71706e6c5bb22
tree7aedfda6b072f238b4d2865945c9939ade6ecf88
parent6a22a8cd3be7ea0f9670562249b9456c3cc97a9e
parent64ebb2c1d3b729e087cc7f4337be4f02f18f2d91
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons