tree 61347dab626892ccb9ee410e6fd53ba1c428be1a
parent 5862b4cb8aca86cdb057e2acff138bbf814d7016
parent d22359e46beeb855da6cab21c5b51ec96f7ccb44
author Eric Fischer <enf@google.com> 1300828104 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300828104 -0700

am d22359e4: (-s ours) am f75f9c53: Import revised translations.  DO NOT MERGE

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