Merge remote-tracking branch 'origin/bug_folder_size_delay' into bug_folder_size_delay
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 9 Jul 2013 11:25:43 +0000 (13:25 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 9 Jul 2013 11:25:43 +0000 (13:25 +0200)
commitfffa77e2115c03dfad403b0f9106736256b7c10b
tree5f9b4083fc5da4315e89d2fd76ec91d9094d8831
parent7a7fe5dbca73817d2e8d55cbd46ab99efa38bacf
parentdcccf73dfb2b5427ade4c8d879e3bb39b20e771f
Merge remote-tracking branch 'origin/bug_folder_size_delay' into bug_folder_size_delay
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java