Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev

This commit is contained in:
Yorke Lee
2013-06-27 21:46:19 +00:00
committed by Android (Google) Code Review

View File

@@ -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 -->