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