Merge branch 'master' into sync_full_folder
authormasensio <masensio@solidgear.es>
Tue, 27 Oct 2015 07:52:17 +0000 (08:52 +0100)
committermasensio <masensio@solidgear.es>
Tue, 27 Oct 2015 07:52:17 +0000 (08:52 +0100)
commitb9ef747a0be9e50d50b709474daf9dca47d60f5f
tree0ca4155ece13e6854b0f1e553bb53ae15b0d695e
parent8f67624a4f3aa16c1c275023c122afcca487fe5d
parent3918ec18a8f7c145c732702c7fc8572f892f4b5b
Merge branch 'master' into sync_full_folder

Conflicts:
owncloud-android-library
src/com/owncloud/android/files/services/FileUploader.java
res/values/strings.xml
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/utils/FileStorageUtils.java