Merge commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb' into froyo-plus-aosp * commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb': Add ILLEGAL_SIM_OR_ME error code.
Merge commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb' into froyo-plus-aosp * commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb': Add ILLEGAL_SIM_OR_ME error code.