tree 33356e3f2507466d8343638f8a6922912a1e9a26
parent 6b089cc68605d44e6dcb8e897ee21ea464a5ff6d
parent bc390d084db226c0b09ae44679156cb5953d3a8b
author Eric Fischer <enf@google.com> 1319238487 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319238487 -0700

am bc390d08: (-s ours) am 170e88eb: (-s ours) Import revised translations.  DO NOT MERGE

* commit 'bc390d084db226c0b09ae44679156cb5953d3a8b':
  Import revised translations.  DO NOT MERGE