Merge of master after sync_review was merged into it
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 23 Nov 2012 09:25:06 +0000 (10:25 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 23 Nov 2012 09:25:06 +0000 (10:25 +0100)
commit4c50eb4d2dd1fba177d743315ae52223430db8cb
treeb74d906f9d8e4e7cf7fc065d75032e5df3f59199
parent60d0a121b7ccffd0d1668f771ba4061ab0254b2e
parent3f2081e6073bd0c11d672890f350da80abc554b2
Merge ... master after sync_review was merged into it
res/values/strings.xml
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/RenameFileOperation.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java