tree 049733ecffebe749b6e7300421cf49f9ed537963
parent f4c354508bfd6d4172c2f15c92e3eaf7bd3270a1
parent bd41d9a431be59cb519bb9aa4f2807fe8130e5b6
author Eric Fischer <enf@google.com> 1321537543 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321537543 -0800

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

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