Wink Saville 055ed42e70 am d9c7fde9: am a00d89e8: am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM" ...

* commit 'd9c7fde961dbb78f980be08b9be77b929630c897':
  Telephony: Add support to read 3GPP2 sms from CSIM/RUIM

2010-12-07 23:00:56 -08:00

..

android/telephony

resolved conflicts for merge of 8484e57f to master

2010-11-22 16:43:59 -08:00

com/android/internal/telephony

am d9c7fde9: am a00d89e8: am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"

2010-12-07 23:00:56 -08:00