tree c75518e008fe8e392194d97b604c8e3f0761fcb5
parent 6a483e7992cce81bb0f98c25090a9566ba12b63e
parent 26132990578b13f432c3c3343053565e592073f7
author Santos Cordon <santoscordon@google.com> 1378341828 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378341828 -0700

am 26132990: am 55d46030: Merge "Changing incall ui label to the already translated "Phone"" into klp-dev

* commit '26132990578b13f432c3c3343053565e592073f7':
  Changing incall ui label to the already translated "Phone"