CMFM: Protect AssociationsDialog from NPE

Patchset 2: Fixed author name

Change-Id: Ice751c89f89f960ef87f89be446a33370ec9d4b8
JIRA: CYAN-786
Issue: https://jira.cyanogenmod.org/browse/CYAN-786
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge remote-tracking branch 'upstream/cm-10.1' into cm10.1-standalone

Conflicts:
	src/com/cyanogenmod/filemanager/ui/dialogs/AssociationsDialog.java