summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-06-12 17:07:06 -0700
committerYorke Lee <yorkelee@google.com>2013-06-12 17:07:06 -0700
commitcad220a4523dc9366957faf920e33f11f887b7dd (patch)
treeb5f7c5f5bbfe67cc1f42108f1203147985f12067 /core
parent00d17f7aab54ef055d35da603dab5a7bae751876 (diff)
downloadframeworks_base-cad220a4523dc9366957faf920e33f11f887b7dd.zip
frameworks_base-cad220a4523dc9366957faf920e33f11f887b7dd.tar.gz
frameworks_base-cad220a4523dc9366957faf920e33f11f887b7dd.tar.bz2
Rename Google Talk to Hangouts in framework
Bug 9058802, 9223276 Change-Id: I89770f0b1d468a3aa2c18c4ee613333c295aefde
Diffstat (limited to 'core')
-rw-r--r--core/res/res/values/strings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index b595d6e..ef0f01d 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -2043,7 +2043,7 @@
<!-- QQ IM protocol type -->
<string name="imProtocolQq">QQ</string>
<!-- Google Talk IM protocol type -->
- <string name="imProtocolGoogleTalk">Google Talk</string>
+ <string name="imProtocolGoogleTalk">Hangouts</string>
<!-- ICQ IM protocol type -->
<string name="imProtocolIcq">ICQ</string>
<!-- Jabber IM protocol type -->