Merge branch 'cm-10.2' of github.com:CyanogenMod/android_device_htc_m7-common into cm-10.2
Revert "m7: selinux: bluetooth policies"

This reverts commit f1d436655df892611bc84ca407d95b389473e48d.
Revert "m7: refine sepolicies"

This reverts commit 478007a9ad97b69def27c62a4ce4101822876aca.
Revert "m7: refine sepolicies"

This reverts commit aebb10e704f1324a1f32486a520e09a265b36b3b.
Revert "m7: selinux support"

This reverts commit f707901010dcf6fc0271401907fd86961ac4cc52.

Conflicts:
	sepolicy/file_contexts

Change-Id: Ice1cf7d94e7745883bb5f35ec52f30e262884064
m7-common: remove camera overlay

* Camera app has been completely moved into Gallery2

Change-Id: I9bb9f7d767e498b3aaebde715497973563899c8c
m7-common: remove deprecated recovery version define

Change-Id: I6a443657daab939a2c25ad28c3daf1ceb2b2c757
m7-common: properly route speaker for regular VOIP playback

Change-Id: I023dbe2ee88afd3e137bc8491e73708d7f1ad7d1
m7-common: Add "length" parameter for /data partition

* Required for "footer" style encryption.

Change-Id: I6ba9f37816097531a4668e6c58998e0400ea3d06

Conflicts:
	rootdir/etc/fstab.qcom.cdma
	rootdir/etc/fstab.qcom.gsm
m7-common: Fix USB charge mode

* Switch to using lpm.rc
* Update charge mode binaries
* Add charger image resources

Change-Id: I79efb86155c61d6eb25dd1d41fae2a27167dcb47
gps.conf: enable LPP_User_Plane_On_Lte.

this fixes gps locking on lte on m7spr.

Change-Id: I61b0a6f15dfe0d972934b0f6089af458315b7b58