am f77fff4b: am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo

Merge commit 'f77fff4b4e904486bf25affde713294d40764e15' into kraken

* commit 'f77fff4b4e904486bf25affde713294d40764e15':
  Add ILLEGAL_SIM_OR_ME error code.