tree 7fcab7e7187b0f5ca7c17ad2f6144cffbc657aae
parent 8ae9c26ce2498eab605f4f4917b627c7685ec39e
parent 47e368a160dd3367cc2831ba1967d2a1e99ca582
author Eric Fischer <enf@google.com> 1297191201 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297191201 -0800

am 47e368a1: (-s ours) am 5cab0dbe: Import revised translations.  DO NOT MERGE

* commit '47e368a160dd3367cc2831ba1967d2a1e99ca582':
  Import revised translations.  DO NOT MERGE