tree b71aa6c7f3a338fb8add1aee98929e7218c8716f
parent a000e143f1596d7f0239695dfeff7425b5960edd
parent 8c5bae8c08186f6e78ee19e64bb7137e771ebb9b
author Eric Fischer <enf@google.com> 1318963113 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318963113 -0700

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

* commit '8c5bae8c08186f6e78ee19e64bb7137e771ebb9b':
  Import revised translations.  DO NOT MERGE