tree 3c1c57e7b8c95e01b49bc375865761b13f01aaf9
parent b95b8dca4b03cbf874d6e708001856490c7893e6
parent e49b8c7878c41f31c817d0661f71d6196dfdde9a
author Eric Fischer <enf@google.com> 1337006883 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337006883 -0700

am e49b8c78: (-s ours) Import translations. DO NOT MERGE

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