tree 03cc4aa43121645c95f5a08d072d379462daab12
parent 0fe7d891ef8baee95d91b4b0340403bdbe792649
parent 0f6dd4506fea5ebb04fb145ec5120ab6b6d36e4b
author Eric Fischer <enf@google.com> 1258499116 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258499116 -0800

am 0f6dd450: (-s ours) am f54d7a2c: am a3cf93a2: (-s ours) Merge change I3ff67703 into eclair

Merge commit '0f6dd4506fea5ebb04fb145ec5120ab6b6d36e4b'

* commit '0f6dd4506fea5ebb04fb145ec5120ab6b6d36e4b':
  Import revised translations.  DO NOT MERGE