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)

Trivial merge