tree 94cac2e1d9cd8a32082c124c0fce9d7aea1e4669
parent 79d433dd8772fb20caa947c2b0b20965348954a7
parent 7778173a32edcfccdcc31407169d2ec40916ca2f
author Eric Fischer <enf@google.com> 1286585973 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286585973 -0700

am 7778173a: (-s ours) am 70f1a3b8: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

Merge commit '7778173a32edcfccdcc31407169d2ec40916ca2f'

* commit '7778173a32edcfccdcc31407169d2ec40916ca2f':
  Import revised translations.  DO NOT MERGE