tree 57cadcc0a7f3385ca9b421130f51bb99a4b57eeb
parent ea340a27e69b129059449f07153e323034911092
parent 37c35377fbcc31ffcb1851b234256687ba465a11
author Jean-Baptiste Queru <jbq@google.com> 1258326283 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258326283 -0800

am 37c35377: merge from open-source master

Merge commit '37c35377fbcc31ffcb1851b234256687ba465a11'

* commit '37c35377fbcc31ffcb1851b234256687ba465a11':
  Import revised translations.  DO NOT MERGE