tree bac5226cfbb9aca8c427a6e09c0be430797b6d27
parent fa42de7249ee96926c61e7632a84205a29b6e113
parent 3f89426152a67d6178c9d3533b0bb43dd20f3006
author Eric Fischer <enf@google.com> 1288049188 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288049188 -0700

am 3f894261: (-s ours) am 188eb406: Import revised translations.  DO NOT MERGE

Merge commit '3f89426152a67d6178c9d3533b0bb43dd20f3006'

* commit '3f89426152a67d6178c9d3533b0bb43dd20f3006':
  Import revised translations.  DO NOT MERGE