tree ed9a435f94073283726271dcfb693ec1b63868ac
parent 285dba8d8cf5a69e257bedc89b564738a207d577
parent 4bc697c07234328127701179ec4d957b70a5e2e4
author Eric Fischer <enf@google.com> 1318963279 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318963279 -0700

am 4bc697c0: (-s ours) am 66e6f388: (-s ours) Import revised translations.  DO NOT MERGE

* commit '4bc697c07234328127701179ec4d957b70a5e2e4':
  Import revised translations.  DO NOT MERGE