tree fde25ef2847f5712fc25296a81a04b4bf653ac14
parent 883f55b1d261862b0de1b43af0b17d351761a9c6
parent 8cd002e279431727f38e77870a3d0a67e96db023
author Eric Fischer <enf@google.com> 1287708258 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287708258 -0700

am 8cd002e2: (-s ours) am e314ac4f: Import revised translations.  DO NOT MERGE

Merge commit '8cd002e279431727f38e77870a3d0a67e96db023'

* commit '8cd002e279431727f38e77870a3d0a67e96db023':
  Import revised translations.  DO NOT MERGE