Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f6ec3048: am e6cb43a1: Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev

Browse Source 
* commit 'f6ec3048546cf8f2821f8a67645df3bab243e591':
  Rename Google Talk to Hangouts in framework
This commit is contained in:
Yorke Lee
2013-06-27 14:52:37 -07:00
committed by Android Git Automerger
parent dbfb2ab4a7 f6ec304854
commit 11b249f641
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/strings.xml
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 -->