Merge branch 'master' of https://github.com/owncloud/android into video_thumbnail
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 10 Aug 2015 14:02:02 +0000 (16:02 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 10 Aug 2015 14:02:02 +0000 (16:02 +0200)
commita1b24dea37013fec794ecee6a6ef2f3fedefc0a3
tree9498104aea93876b463a5074640accf865ce31c4
parent928ce1a8b618416022b71ec96a2a212f64fe5955
parent2b79f3292f5ca8b5e7f15ff6b2303df3d6802b36
Merge branch 'master' of https://github.com/owncloud/android into video_thumbnail
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java