tree f0e8285084f1095f81dd1506d93108b278d4e778
parent f82447e43e87c288c3bb41cdb0474a3204c2bd0d
parent 969907f3f59cf9420c3bd9d672b509196cf82cbe
author Jean-Baptiste Queru <jbq@google.com> 1280440609 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280440609 -0700

am 969907f3: am f0fa8416: Merge "Make hasIccCard return true if RUIM card is present."

Merge commit '969907f3f59cf9420c3bd9d672b509196cf82cbe'

* commit '969907f3f59cf9420c3bd9d672b509196cf82cbe':
  Make hasIccCard return true if RUIM card is present.