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

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

am 11b249f6: am f6ec3048: am e6cb43a1: Merge "Rename Google Talk to Hangouts... 

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

* commit '11b249f6':
  Rename Google Talk to Hangouts in framework
parents db4ae2b1 11b249f6

core/res/res/values/strings.xml

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