am cba66d82: (-s ours) am c08eb279: Import revised translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Tue, 26 Oct 2010 00:30:55 +0000 (17:30 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 26 Oct 2010 00:30:55 +0000 (17:30 -0700)
commit2216495ce555fa59f8878c5bbfc6439a53547c2f
tree40dd474366540ba75e01951187d801dfde215c2a
parent399fad44a108741b40de57a0d504b87cbc618b01
parentcba66d82e30d3ae1be826989229975e05cd9a754
am cba66d82: (-s ours) am c08eb279: Import revised translations.  DO NOT MERGE

Merge commit 'cba66d82e30d3ae1be826989229975e05cd9a754'

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