tree a8e119f57334ec46eb2903ff85416532d7a1f8b4
parent 74296aa972f5a3df707aa9412910ef6c2ec9bc2a
parent 576b585855424c596dc8dc5fb7fcae7edb9edc52
author Eric Fischer <enf@google.com> 1256230002 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256230002 -0700

am 576b5858: (-s ours) am 5025b3e7: am 284a95e6: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '576b585855424c596dc8dc5fb7fcae7edb9edc52'

* commit '576b585855424c596dc8dc5fb7fcae7edb9edc52':
  Import revised translations.  DO NOT MERGE