tree 559eeaf0eaf27408699d5b846e23649297ceb8f6
parent 9ad9cd5a2b4db696a625fa3e17a42088b77c8a1c
parent 04b48fbdd6df4999379b48496b1dd7eb891d2b2a
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.