Merge "CMFileManager : Dismiss shortcutActivity before proceeding" into cm-11.0

author Jorge Ruesga <jorge@ruesga.com>

Sun, 17 Nov 2013 02:34:52 +0000 (02:34 +0000)

committer Gerrit Code Review <gerrit@cyanogenmod.org>

Sun, 17 Nov 2013 02:34:52 +0000 (02:34 +0000)
author Jorge Ruesga <jorge@ruesga.com>
Sun, 17 Nov 2013 02:34:52 +0000 (02:34 +0000)
committer Gerrit Code Review <gerrit@cyanogenmod.org>
Sun, 17 Nov 2013 02:34:52 +0000 (02:34 +0000)
diff --cc src/com/cyanogenmod/filemanager/ui/policy/IntentsActionPolicy.java
Simple merge
author	Jorge Ruesga <jorge@ruesga.com>
	Sun, 17 Nov 2013 02:34:52 +0000 (02:34 +0000)
committer	Gerrit Code Review <gerrit@cyanogenmod.org>
	Sun, 17 Nov 2013 02:34:52 +0000 (02:34 +0000)