Merge branch 'develop' into remove_folder_size_info
authormasensio <masensio@solidgear.es>
Mon, 24 Feb 2014 12:37:48 +0000 (13:37 +0100)
committermasensio <masensio@solidgear.es>
Mon, 24 Feb 2014 12:37:48 +0000 (13:37 +0100)
commitc8fc9cfa70774498570ea422144ef432d2ebaa3f
treeba185813d63e766846d80ef6a056e78b3915cb17
parenta5215ce89edb5405a0c85c2137d2b4cc091d084a
parent271078a4039f3c674462f929bc97528901e41e64
Merge branch 'develop' into remove_folder_size_info
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/syncadapter/FileSyncAdapter.java