am cc907741: Merge change 22660 into eclair

Merge commit 'cc907741b9b7344820ffbc8d68992567d74d0f4b' into eclair-plus-aosp

* commit 'cc907741b9b7344820ffbc8d68992567d74d0f4b':
  Simplify data icons of CDMA in status bar.