tree 3948f6c9c32e358d2312820d4a4c766d994054d7
parent 230d4c236982058767225f59ad6b5a3fc3f638b6
parent fb314c7782682b75b1be47beac0d5f2bcef2584c
author Eric Fischer <enf@google.com> 1328897142 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897142 -0800

am fb314c77: Import translations. DO NOT MERGE

* commit 'fb314c7782682b75b1be47beac0d5f2bcef2584c':
  Import translations. DO NOT MERGE