OSDN Git Service

resolved conflicts for merge of d027329c to gingerbread-plus-aosp
authorMarco Nelissen <marcone@google.com>
Wed, 15 Jun 2011 15:33:09 +0000 (08:33 -0700)
committerMarco Nelissen <marcone@google.com>
Wed, 15 Jun 2011 15:58:38 +0000 (08:58 -0700)
commitd8f9a83cab34de38981dc3ba5ca9df8dda02dbc0
tree72310f758560e816954288ec778751be26c45b6d
parent653fd9cfacd15ddf9c482c46619ca9323da57726
parentd027329cd6105c05c157e3858a170e4f04eb0e3e
resolved conflicts for merge of d027329c to gingerbread-plus-aosp

Change-Id: I169c415bf998b9935ab36812511573db05717b91
core/res/res/values/config.xml
telephony/java/com/android/internal/telephony/WapPushOverSms.java
telephony/java/com/android/internal/telephony/WspTypeDecoder.java
telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java