tree e30886cdef6de3fc6dc746ef001c31db99747d1b
parent d3a8b95e0a9af9f1062f673929eb8568ebbececa
parent 1b8063cc6877850b65c73c8dfe38857cc170293b
author Eric Fischer <enf@google.com> 1319238354 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319238354 -0700

am 1b8063cc: (-s ours) am a05957a1: (-s ours) Import revised translations.  DO NOT MERGE

* commit '1b8063cc6877850b65c73c8dfe38857cc170293b':
  Import revised translations.  DO NOT MERGE