am 5e6ad478: Merge change 22496 into eclair

Merge commit '5e6ad4786d599e17c1736cf52e5846a44e19d374' into eclair-plus-aosp

* commit '5e6ad4786d599e17c1736cf52e5846a44e19d374':
  fix typo
This commit is contained in:
Wei Huang
2009-08-24 15:07:01 -07:00
committed by Android Git Automerger

View File

@ -2935,8 +2935,8 @@ public final class Settings {
* it so the UI can give it some special treatment when displaying the "time sent" for * it so the UI can give it some special treatment when displaying the "time sent" for
* it. This setting is to control what x is. * it. This setting is to control what x is.
*/ */
public static final String GTALK_OLD_CHAT_MESSAGE_THREADHOLD_IN_SEC = public static final String GTALK_OLD_CHAT_MESSAGE_THRESHOLD_IN_SEC =
"gtalk_old_chat_msg_threadhold_in_sec"; "gtalk_old_chat_msg_threshold_in_sec";
/** /**
* a setting to control the max connection history record GTalkService stores. * a setting to control the max connection history record GTalkService stores.