tree 103fe345bec704c83538bc7cd251fac08d4b788b
parent ed5b0a4fbe3ebbdc92342bde8145b28cf3811642
parent 59b2307edb692344d8a05002172858d15638e8c3
author Eric Fischer <enf@google.com> 1255049649 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255049649 -0700

am 59b2307e: am ea631334: (-s ours) am 92a90a31: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '59b2307edb692344d8a05002172858d15638e8c3' into eclair-mr2-plus-aosp

* commit '59b2307edb692344d8a05002172858d15638e8c3':