Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
authorAndy Scherzinger <info@andy-scherzinger.de>
Wed, 12 Aug 2015 16:49:33 +0000 (18:49 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Wed, 12 Aug 2015 16:49:33 +0000 (18:49 +0200)
commitc4d8c423b00da8198e21c83df5f341c341875f38
treea4620b75b45dfd8614e850ae8c9dc74f700bd4a1
parent5257af90bc4365e37bc163a4a1d7a8ef0046ab4a
parent066190f97702be331998ec9a02fc1f90e3dd9016
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_toolbar