Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev
This commit is contained in:
@@ -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 -->
|
||||
|
||||
Reference in New Issue
Block a user