am 9eaff61a: am 91bb62f0: New API 4 with new CDMA constants.
am 9eaff61a: am 91bb62f0: New API 4 with new CDMA constants.

Merge commit '9eaff61adf15b4e6cced7da3d7c239e2fc41f8ed' into eclair-plus-aosp

* commit '9eaff61adf15b4e6cced7da3d7c239e2fc41f8ed':
  New API 4 with new CDMA constants.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base