Merge branch 'navigationDrawer_update' of github.com:owncloud/android into navigation...
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 27 May 2015 16:35:39 +0000 (18:35 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 27 May 2015 16:35:39 +0000 (18:35 +0200)
commita75ffde65f732d695f557bdfe7d954c40cfae4d4
tree85a6502ad6d4fbd27fc9d617b0b0b05a55c101fd
parente80828afeda92b2997a25e0d5bb7de0b7501d4a4
parent7196b8837445b3ff9bcdabcb2dc86b82273d5e2e
Merge branch 'navigationDrawer_update' of github.com:owncloud/android into navigationDrawer_update