tree e8fce1ba0c43f7136e63920ea97bbf92980c34cf
parent fde273baf6592a5fde15ee4dd4d798d90368e440
parent 91bb62f0dc002065cb1932a96fecf15c1b92b6e9
author Xavier Ducrohet <xav@android.com> 1257530429 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257530429 -0800

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

Merge commit '91bb62f0dc002065cb1932a96fecf15c1b92b6e9' into eclair

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