tree 86e1a1737ea44c92905df37189a171d0d5028234
parent db20ffdc077df6083b4a4ae7b1113cad6ca7bd0c
parent ca5d8fc918e3ecdf5777a6843786f401b0c21d8f
author Eric Fischer <enf@google.com> 1318963580 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318963580 -0700

am ca5d8fc9: (-s ours) am 19ce4d95: (-s ours) Import revised translations.  DO NOT MERGE

* commit 'ca5d8fc918e3ecdf5777a6843786f401b0c21d8f':
  Import revised translations.  DO NOT MERGE