Merge commit '310b322d' into fix-merge-conflict
authorWink Saville <wink@google.com>
Tue, 26 Mar 2013 23:43:44 +0000 (16:43 -0700)
committerWink Saville <wink@google.com>
Tue, 26 Mar 2013 23:43:44 +0000 (16:43 -0700)
commit652fe674a597e221274a3746118f15cf40c7dbb9
tree8ebe399964acdd36da1a19d5e8d3300d413003d2
parent4e9ed0410d72180872d59b14cb375c1c2ed94788
parent310b322dc0a45b3b122f65dfdccbfc7d0b1d9d8d
Merge commit '310b322d' into fix-merge-conflict

* commit '310b322d':
  Telephony: Delay SIM IO until SIM_READY

Change-Id: I50618a1fb06a7eb465f7a0d9b4b8d6fb53ad1339
src/java/com/android/internal/telephony/uicc/IccRecords.java
src/java/com/android/internal/telephony/uicc/RuimRecords.java
src/java/com/android/internal/telephony/uicc/SIMRecords.java