Merge branch 'master' of https://github.com/owncloud/android into target_marshmallow
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 27 Nov 2015 20:40:01 +0000 (21:40 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 27 Nov 2015 20:40:01 +0000 (21:40 +0100)
commit4d47f348c3cac7095ee341b8b33aac4ae3cc5320
treed9d80e84a90098d28076ca119f6958c91ee3e06c
parent69833ca31821cd29870095422ec72880952cb4f6
parentc17374387045031eb334dae50911792fd9f11e38
Merge branch 'master' of https://github.com/owncloud/android into target_marshmallow
src/com/owncloud/android/authentication/AuthenticatorActivity.java
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java