a1e350eadc
Merge commit 'b89cfb0f9db2b1a4655c5e78e5c57855b5a78ee9' into eclair-plus-aosp * commit 'b89cfb0f9db2b1a4655c5e78e5c57855b5a78ee9': Conditionalized CDMA-specific test.