tree aa92e8c594d9cbda5e0473a02cfc310f32c9574b
parent b71d88d5c09f1d1de0ae678e238b8d1691146420
parent da646ac63099afa684a845b8932b1d8b3043c6c2
author Eric Fischer <enf@google.com> 1260517234 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260517234 -0800

am da646ac6: (-s ours) am 531ffb58: am 9c1d7d01: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'da646ac63099afa684a845b8932b1d8b3043c6c2'

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