tree ec2a31d811ed2cb796be0b10792e5b618def51cc
parent f87e4dbff4421ad85f1b80639e4b8e3d0b567898
parent 5e521d47068b9f5a9dbe644360596cd0b3521f4e
author Eric Fischer <enf@google.com> 1298504448 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298504448 -0800

am 5e521d47: (-s ours) am d1773030: Import revised translations.  DO NOT MERGE

* commit '5e521d47068b9f5a9dbe644360596cd0b3521f4e':
  Import revised translations.  DO NOT MERGE