tree 085857558285a6f052ecf8a2120942076913ccff
parent 3795d62b95213fa0ead4de6b974d310038823160
parent 7c137e3ceec2757907422b0aa3b3da90c37df702
author Kenny Root <kroot@google.com> 1287423176 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287423176 -0700

am 7c137e3c: (-s ours) am 6b4bbd9b: Import revised translations DO NOT MERGE

Merge commit '7c137e3ceec2757907422b0aa3b3da90c37df702'

* commit '7c137e3ceec2757907422b0aa3b3da90c37df702':
  Import revised translations DO NOT MERGE