OSDN Git Service

Merge from gingerbread
authorJean-Baptiste Queru <jbq@google.com>
Thu, 3 Feb 2011 21:17:49 +0000 (13:17 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 3 Feb 2011 21:17:49 +0000 (13:17 -0800)
commit4b8ad9effd95508e9966b8a3a355f0a948558ae2
treeca366320f4a66b7b2f04e071e931f31e5f4c9a5f
parent8226140ccadbc8e0bdd093f8bab0a5292b9224e3
parent2703b84caabe7b4fb7f6c08bf7463a89b0a3169c
Merge from gingerbread

Change-Id: Id0509272ef8382fb0004f4d38bbba744e3487a8c
core/java/android/provider/Telephony.java
telephony/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java