....4.2-BETA1!!

Change-Id: Ia452f6b9bb6e625ea1aee60d8080bffcb5558124
Signed-off-by: Evan Anderson <evan@thelinuxman.us>
apns: Add type default for Sprint.

Change-Id: I9e5c5702a47a1497120bb808b2d1c6585dde538b
Squashed revert of mms and spn-specific overlays

In theory, could have been a good idea, but ultimately just leads to
headaches for device maintainers that need to overlay any of these.

Revert "overlay: remove Verizon specific eri.xml"

This reverts commit 5f92da62c686c12c00fc9f7948654816c586f838.

Revert "Add Japanese APNs/eri for au, docomo MVNO, EMOBILE and SoftBank"

This reverts commit eeeb0888d437ac0147cfe4b81aba264cf0d00b70.

Revert "Add apns/eri for Boost Mobile"

This reverts commit b207e2eda31e10a45a20774c61dc350975095d1b.

Revert "add more vzw eri's"

This reverts commit 82e10af192daaacf9e819253264a09a7051d0e06.

Revert "multi-carrier overlays: Add eri and config for US Cellular"

This reverts commit 1af75f1ba7abb351ec1113eeceaa00389a119e3b.

Revert "Multi-carrier overlays: Fix Mms"

This reverts commit f8b0737a435d211b01baf5df3feb9f98039884e2.

Revert "Generic multi-carrier overlays based on hammerhead"

This reverts commit 6f5758c9c33d1be82f76e32a8d83b427204436d1.

Change-Id: I3495a89ce405362dc558f7ec7f0e61adea9fa507
Re-add apns from squashed revert

apns re-added from:
- Add apns/eri for Boost Mobile
- Add Japanese APNs/eri for au, docomo MVNO, EMOBILE and SoftBank

Change-Id: I2e0091cc4ed1a5c6957792940aba13b801bf7335
Revert "Add SELinux filesystem relabeling to init"

This reverts commit d2d1a7ffb1f5e831ed654379496f0efe88159a66.

Revert "selinuxrelabel: Remove attempts to relabel /system"

This reverts commit cae5f245304fe11e86323aa7f6f4c25e898bf36b.

Revert "Recheck /data for selinux labeling"

This reverts commit c4dcb16ca9f51341fdd81a61fb3c00861344c030.

Revert "selinuxrelabel: Add a check for dalvik-cache"

This reverts commit c7e92306143a7b11b570ea110bc467d881a2528d.

Revert "selinuxrelabel: Need to check in priv-app now"

This reverts commit 3013c99acb51f8c2aa1156930e864cfdbcc22135.

Revert "selinux: When adding userdata labels, do cache too"

This reverts commit 8994907baf46dc1ddd78467ec57ff78639c01937.

Revert "selinux: Use a more reliable sentinel to flag /data labelling"

This reverts commit b52874de531340af02ac8e664d828dcd02d2d860.

Change-Id: I7779aaca3b0751ed74d525292681817182a0aa7f

Conflicts:

	config/common.mk
	prebuilt/etc/init.d/50selinuxrelabel
Add support for odin (Xperia ZL)
vendor: Add GT-N5110 support (Note 8.0 Wifi)

Change-Id: I2aa4b8df2b9aacec1583d6c551f1ff3bfd053b4d
Merge branch 'kitkat' of https://github.com/AOSPA-legacy/android_vendor_pa into kitkat
Merge remote-tracking branch 'pa-legacy-kitkat/kitkat' into kitkat