Merge remote-tracking branch 'cm/cm-10.2' into wszf
Merge branch 'cm-10.2' of https://github.com/Wosp/android_packages_apps_CMFileManager into wszf