tree ed93422ec9465b67369c2dc5160dec38d5e3f722
parent ac20d91f6395df531f728aeffbb83038fb81d09c
parent d57d9abd52395d52492e5471a0b7dd14e7d039c9
author Eric Fischer <enf@google.com> 1298414923 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298414923 -0800

am d57d9abd: (-s ours) am a47d23f9: Import revised translations.  DO NOT MERGE

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