Merge branch 'navigationDrawer_update' of github.com:owncloud/android into navigation...
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 27 May 2015 16:35:21 +0000 (18:35 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 27 May 2015 16:35:21 +0000 (18:35 +0200)
commite80828afeda92b2997a25e0d5bb7de0b7501d4a4
tree2c1f6ae401d14f1b05840f2221148c71b69825d0
parentbc5e05934f3f14cb6369a95dca689da9a655e958
parent0238727d1368a0357804eb3daf4e2917bfc81429
Merge branch 'navigationDrawer_update' of github.com:owncloud/android into navigationDrawer_update
src/com/owncloud/android/ui/adapter/NavigationDrawerListAdapter.java