Merge branch 'cm-10.1' into cm-10.1-openpdroid
Merge branch 'cm-10.1-openpdroid' of git://github.com/wsot/platform_packages_apps_mms into cm-10.1