tree 0143533302f282e6c9ca2a6c753c69cc4da5b398
parent b221464aa98772c22f409b59afd9dea05fe81223
parent 2dbeb0a91b89ca5dc03cff0df638123dcbb2d125
author Eric Fischer <enf@google.com> 1253563864 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253563864 -0700

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

Merge commit '2dbeb0a91b89ca5dc03cff0df638123dcbb2d125'

* commit '2dbeb0a91b89ca5dc03cff0df638123dcbb2d125':
  Import revised translations.  DO NOT MERGE