tree 299e7fff793adb6a115338f7c65a45510d10252a
parent 6b6d1148e02e56c366fb5c112f60f7302cd9295f
parent 9fa06d17d94deb79989a61ed1d273085046a21ef
author Eric Fischer <enf@google.com> 1258140780 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258140780 -0800

am 9fa06d17: (-s ours) am 765403ef: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit '9fa06d17d94deb79989a61ed1d273085046a21ef'

* commit '9fa06d17d94deb79989a61ed1d273085046a21ef':
  Import revised translations.  DO NOT MERGE