Merge commit '9eaff61adf15b4e6cced7da3d7c239e2fc41f8ed' into eclair-mr2 * commit '9eaff61adf15b4e6cced7da3d7c239e2fc41f8ed': New API 4 with new CDMA constants.
Merge commit '9eaff61adf15b4e6cced7da3d7c239e2fc41f8ed' into eclair-mr2 * commit '9eaff61adf15b4e6cced7da3d7c239e2fc41f8ed': New API 4 with new CDMA constants.