tree bedf42b14a2f18f9c72481e3453670bc8f3a39b1
parent cb744bd2ee54f6888c62820897d17b8ab9122dcf
parent e0a15f237d9722e69ab1e0375f24c698704528fe
author Eric Fischer <enf@google.com> 1256928028 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256928028 -0700

am e0a15f23: Import translations

Merge commit 'e0a15f237d9722e69ab1e0375f24c698704528fe' into eclair-mr2

* commit 'e0a15f237d9722e69ab1e0375f24c698704528fe':
  Import translations