tree 99afa5ef991853ad572bebce93913af3baf52dfc
parent 1fdde7981b5d081cc3f76fe4bac08fbe10a67a03
parent eaa01f68f24d78b15275a0ee39bc2d6e53f6733e
author Eric Fischer <enf@google.com> 1259716221 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259716221 -0800

am eaa01f68: (-s ours) Merge change I46fb1c7f into eclair

Merge commit 'eaa01f68f24d78b15275a0ee39bc2d6e53f6733e' into eclair-mr2

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