tree 40f907836d648cca3510910f3bc9f7b00692830a
parent c80d4f9aaeffd3f728d6afbd857c8ccaaedf35b5
parent 0be57bf57637a088493e64ad9da9b4a4eb7ebe89
author Eric Fischer <enf@google.com> 1316216544 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316216544 -0700

am 0be57bf5: (-s ours) am 482b3d73: (-s ours) Import revised translations.  DO NOT MERGE

* commit '0be57bf57637a088493e64ad9da9b4a4eb7ebe89':
  Import revised translations.  DO NOT MERGE