tree 84ba68998d62228afdb4246b0038eef51bd3f21f
parent f1affb0cb2742c9fa5300337f1fb64bd4a0d138e
parent 4913cfe2a356d439a7ba055096c2f2cb0c8ad18c
author Baligh Uddin <baligh@google.com> 1358527211 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358527211 -0800

am 4913cfe2: am de53f6ed: am cac30827: Import translations. DO NOT MERGE

* commit '4913cfe2a356d439a7ba055096c2f2cb0c8ad18c':
  Import translations. DO NOT MERGE