tree 4badc2a6c4430a38a177eb91c5d05fff327d24d7
parent 6e1f4ca15827933cfc05272e6609f76285f34c6d
parent 4c165fe66d439efe4850214f78730c400c47f292
author Eric Fischer <enf@google.com> 1319238153 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319238153 -0700

am 4c165fe6: (-s ours) Import revised translations.  DO NOT MERGE

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