Merge remote-tracking branch 'origin/refactor_update_filelist_from_database' into...
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 7 May 2014 08:03:41 +0000 (10:03 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 7 May 2014 08:03:41 +0000 (10:03 +0200)
commite42fcc1e32fcf129889e5b58b3bc2a9fda5f4c16
tree4731b03d49148ff5f06ffd4cceaa190a4316f19f
parent3adb39a15e34d046dfd587bf63e91786cb295c5c
parent69fa5b9185d693d7887ea09ac06733dcaa21c3e6
Merge remote-tracking branch 'origin/refactor_update_filelist_from_database' into refactor_update_filelist_from_database
src/com/owncloud/android/ui/activity/FileDisplayActivity.java