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