Merge branch 'develop' of https://github.com/owncloud/android into multi2
authorSam <odeh_sam@hotmail.com>
Fri, 5 Dec 2014 09:07:48 +0000 (10:07 +0100)
committerSam <odeh_sam@hotmail.com>
Fri, 5 Dec 2014 09:07:48 +0000 (10:07 +0100)
commitc8af196f2ab6956ee21745fcb58379bbac762aaa
tree6d487d78759f3f5cd318f9d461ce416f88baf202
parent382191d1f94c02475bdd607852e552b5621a7d9c
parentc7c53c93ba4b109e533808ae780be6ccd3fb51a5
Merge branch 'develop' of https://github.com/owncloud/android into multi2
src/com/owncloud/android/ui/activity/FileDisplayActivity.java