tree 80c121d9ee8313c471f9b458727265e91b9dd7bf
parent 9b2ef9f6042ccd5f2423f1a9ccbde7fd63732349
parent 67d82f179bd1b92780e7f245166c64fbe300e531
author Eric Fischer <enf@google.com> 1338317518 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338317518 -0700

am 67d82f17: Import translations. DO NOT MERGE

* commit '67d82f179bd1b92780e7f245166c64fbe300e531':
  Import translations. DO NOT MERGE