Merge remote-tracking branch 'upstream/cm-10.2' into pa-4.3
Merge branch 'pa-4.3' of https://github.com/alteredlikeness/android_device_motorola_omap4-common into pa-4.3