tree 6deb9ed50cf4f187e8209187692b8de680557384
parent a82fed7efb7a50c4dd977d905819ac5dbfaf6e26
parent 3f3a000a0da8c9978276dc121b5082bda37386a2
author Eric Fischer <enf@google.com> 1318963251 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318963251 -0700

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

* commit '3f3a000a0da8c9978276dc121b5082bda37386a2':
  Import revised translations.  DO NOT MERGE