tree 11e03ff242bc8e44de2881bbc7a89839da872deb
parent 706c661348c6c904e6e9c22f2bbd996dfdd2b424
parent 8b658253361971b920ebc7faaed96dec91dbb731
author Baligh Uddin <baligh@google.com> 1353117109 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353117109 -0800

am 8b658253: am 50a89116: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit '8b658253361971b920ebc7faaed96dec91dbb731':
  Import translations. DO NOT MERGE