Merge branch 'master' of https://github.com/owncloud/android into video_thumbnail

author Andy Scherzinger <info@andy-scherzinger.de>

Mon, 10 Aug 2015 14:02:02 +0000 (16:02 +0200)

committer Andy Scherzinger <info@andy-scherzinger.de>

Mon, 10 Aug 2015 14:02:02 +0000 (16:02 +0200)
author Andy Scherzinger <info@andy-scherzinger.de>
Mon, 10 Aug 2015 14:02:02 +0000 (16:02 +0200)
committer Andy Scherzinger <info@andy-scherzinger.de>
Mon, 10 Aug 2015 14:02:02 +0000 (16:02 +0200)
diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
Simple merge
diff --cc src/com/owncloud/android/ui/fragment/OCFileListFragment.java
Simple merge
author	Andy Scherzinger <info@andy-scherzinger.de>
	Mon, 10 Aug 2015 14:02:02 +0000 (16:02 +0200)
committer	Andy Scherzinger <info@andy-scherzinger.de>
	Mon, 10 Aug 2015 14:02:02 +0000 (16:02 +0200)
		1	2
src/com/owncloud/android/ui/adapter/FileListListAdapter.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/ui/fragment/OCFileListFragment.java	patch \|	diff1 \|	diff2 \|	blob \| history