tree 829231016e099774dfc0532c102a3c179ea40523
parent 590e31054e5a1971e1e8aa65f381a3e00be4b005
parent 3db5c3fec31c163443aca42e8c7ebc372b0cd2f5
author Eric Fischer <enf@google.com> 1258140904 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258140904 -0800

am 3db5c3fe: (-s ours) am 17793c1f: am 0e2a846d: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '3db5c3fec31c163443aca42e8c7ebc372b0cd2f5'

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