Merge branch 'cm-10.1' of git://github.com/PAC-man/android_frameworks_base into PAC