Merge commit '91bb62f0dc002065cb1932a96fecf15c1b92b6e9' into eclair * commit '91bb62f0dc002065cb1932a96fecf15c1b92b6e9': New API 4 with new CDMA constants.
Merge commit '91bb62f0dc002065cb1932a96fecf15c1b92b6e9' into eclair * commit '91bb62f0dc002065cb1932a96fecf15c1b92b6e9': New API 4 with new CDMA constants.