David A. Velasco aa0e4b8cc8 Fix crash opening or sending files in Android 7 ... # Conflicts: # res/values/setup.xml # src/com/owncloud/android/ui/activity/Preferences.java		2016-11-02 23:34:50 +01:00
..
authenticator.xml
exposed_filepaths.xml
preferences.xml
syncadapter_files.xml
users_and_groups_searchable.xml