Merge branch 'cm-10.1' of https://github.com/CyanogenMod/android_device_htc_evita into jb-4.2
Merge branch 'cm-10.1' of https://github.com/CyanogenMod/android_device_htc_evita into jb-4.2
Merge remote-tracking branch 'upstream/cm-10.1' into jb-4.2
evita: move GSM permission up the inheritance chain

Change-Id: I18da4213c0ec9b274d39e84ea2a415ceb345a8cb
Merge branch 'jb-4.2' of github.com:TeamBAKED/device_htc_evita into jb-4.2