Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2
Merge branch 'cm-10.2' of https://github.com/PAC-Motorola/android_device_motorola_msm8960-common into cm-10.2