tree 99afa5ef991853ad572bebce93913af3baf52dfc
parent 6b642891b9f24edc1020ee93a5d8049b0bef8c06
parent f3e114265bc3fe843330eeb31a6c6c7364e9bf31
author Eric Fischer <enf@google.com> 1259717386 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259717386 -0800

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

Merge commit 'f3e114265bc3fe843330eeb31a6c6c7364e9bf31' into eclair-mr2-plus-aosp

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