am 2679082d: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge

* commit '2679082da074b29be8ac8e6f9bb02591318be388':
  show 3G icon for CDMA/1xRTT