Merge branch 'master' into copy
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 1 Sep 2015 16:35:51 +0000 (18:35 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 1 Sep 2015 16:35:51 +0000 (18:35 +0200)
commite6be60679fd7bc781dbd7a2a2b82d58eb720b746
tree4778e29f911215ca4444ceab7c46e36500a1fc3a
parent1e8c83b22e5a275d4ff7359ffc4db45703d2a6aa
parent136db6a76553678c866019be6010f51ae1a3751c
Merge branch 'master' into copy

Conflicts FIXED:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/FileDownloadFragment.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
AndroidManifest.xml
build.gradle
res/values/strings.xml
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/FileDownloadFragment.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java