tree abe447a1dbfc2d14d127600a6afb7dd65d45abbf
parent b2948b0458e6206998e8a0700297119890faa233
parent a54290f1648d33b60c5b88dbc2a4a9229880f23e
author Eric Fischer <enf@google.com> 1305064142 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305064142 -0700

am a54290f1: am f255cedc: (-s ours) Import revised translations.  DO NOT MERGE

* commit 'a54290f1648d33b60c5b88dbc2a4a9229880f23e':
  Import revised translations.  DO NOT MERGE