tree c93f1ac38e9beff0c50b40b17cc53bbf1cb5e6ed
parent dbfb2ab4a760f0da910758467a7b9fccf09e97f5
parent f6ec3048546cf8f2821f8a67645df3bab243e591
author Yorke Lee <yorkelee@google.com> 1372369957 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372369957 -0700

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

* commit 'f6ec3048546cf8f2821f8a67645df3bab243e591':
  Rename Google Talk to Hangouts in framework