tree 50b72c88967bb2dce2bf951ce69c94e746e7dcc2
parent 9b016a7f77bbee70ed94006eef1f674b93c8a1ce
parent 7c40d5ee855c4468d74b7ce030415763a9649ff7
author Eric Fischer <enf@google.com> 1288053086 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288053086 -0700

am 7c40d5ee: (-s ours) am afd569b4: Import revised translations.  DO NOT MERGE

Merge commit '7c40d5ee855c4468d74b7ce030415763a9649ff7'

* commit '7c40d5ee855c4468d74b7ce030415763a9649ff7':
  Import revised translations.  DO NOT MERGE