tree 1b684a7fad1f0fc03b3c797fb5e67fb129909b09
parent 7e55d996515b6e7cb803b4bad9427be87c6524b8
parent 47dc093e273b2587d18bcdc2c8a04660228c7ff5
author Eric Fischer <enf@google.com> 1320941700 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320941700 +0000

am 47dc093e: (-s ours) am 215739d0: (-s ours) Import revised translations.  DO NOT MERGE

* commit '47dc093e273b2587d18bcdc2c8a04660228c7ff5':
  Import revised translations.  DO NOT MERGE