tree 37f921807c2bb7166132ceb5de97cd6a10255580
parent 8a1e8dad4d27a4abfb34d41e0ab0d92b3eca9bb7
parent 96219dc279f268ef1bcbb7cdf5da8dbb5f5022df
author Eric Fischer <enf@google.com> 1320281154 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320281154 +0000

am 96219dc2: am 98363247: (-s ours) am c703b368: (-s ours) Import revised translations.  DO NOT MERGE

* commit '96219dc279f268ef1bcbb7cdf5da8dbb5f5022df':
  Import revised translations.  DO NOT MERGE