John Wang ff42c04d15 Merge "Support SIM permanently disabled state." into honeycomb-LTE

2011-06-16 11:22:53 -07:00

..

android/telephony

Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE

2011-06-07 15:49:34 -07:00

com/android/internal/telephony

Merge "Support SIM permanently disabled state." into honeycomb-LTE

2011-06-16 11:22:53 -07:00