tree fc1b51828091145c529fc972e45743cc80bf6964
parent a0316493881ad09b647a4198952f2880003b8d37
parent 61ce99e79b4c88b8628b86afdc6c79955edba2b5
author Eric Fischer <enf@google.com> 1249344292 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1249344292 -0700

am 61ce99e7: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '61ce99e79b4c88b8628b86afdc6c79955edba2b5'

* commit '61ce99e79b4c88b8628b86afdc6c79955edba2b5':
  Import revised translations.  DO NOT MERGE