Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 22 Oct 2014 06:09:47 +0000 (08:09 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 22 Oct 2014 06:09:47 +0000 (08:09 +0200)
commitd7b32ecc1754cc06023de2e6f2bbbf3555514d74
tree14c3ab079f95e8c96ff3a005b81c1bef1715c826
parente5515c1a2d4ec96b52224df11d19259ffafa2b66
parent25a36a4fe70423625e454b172aa46cbe48a3cfc9
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan

Conflicts:
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
project.properties
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java