tree f355ec839933765d789d1c110486c91670f5ceeb
parent 1c20868120ca762f9f8643a3dfbcfd6302604c1a
parent c9b5d2b9808653a94a4d830d5fb2f0ecda958f1e
author Eric Fischer <enf@google.com> 1335470604 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335470604 -0700

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

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