Commits
The Android Open Source Project authored and Android Git Automerger committed 74414252970M
am 7ca69a73: (-s ours) am 7c927b1b: am 633233bc: (-s ours) Reconcile with jb-release - do not merge * commit '7ca69a7393fc39d5ec814857581a2ceaf9ec8d3d': Fix NPE on some phones at startup. Fix 6804479: "Emergency calls only" in notification shade Implement CMAS service category program results. Fix detection of CDMA cell broadcast messages. Fix our interpretation of apn setting's bearer.
Showing diff to7ca69a7393f