tree 840358c5537173a97a09659815656fae5e4b4ce7
parent 29632a4deb005975597aba0dbd7a124c2f85319e
parent a330ca6cd0d03f5c1929dd9388a5c90b7e3b05ea
author Eric Fischer <enf@google.com> 1300141326 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300141326 -0700

am a3ef0bb7: (-s ours) am d5e8dae8: Import revised translations.  DO NOT MERGE

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