Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2
Merge branch 'cm-10.2' of git://github.com/beegee-tokyo/android_frameworks_base into cm-10.2