added intent null pointer check to FileManagers onActivityResult
Merge remote-tracking branch 'upstream/master'