Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6ec3048 authored by Yorke Lee's avatar Yorke Lee Committed by Android Git Automerger
Browse files

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

* commit 'e6cb43a1':
  Rename Google Talk to Hangouts in framework
parents 93d46952 e6cb43a1

core/res/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -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 -->