tree 3948f6c9c32e358d2312820d4a4c766d994054d7
parent c3307f7b61ae37aa26a05b37604a04c9c2e47f19
parent 3d9adfb03a4953eef3ba8596d9dd7a69486bf2e6
author Eric Fischer <enf@google.com> 1328897315 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897315 -0800

am 3d9adfb0: am fb314c77: Import translations. DO NOT MERGE

* commit '3d9adfb03a4953eef3ba8596d9dd7a69486bf2e6':
  Import translations. DO NOT MERGE