tree 4905e9ee8902a3217c52df35e320c0ef590d0e63
parent 208f1dfb775914b5a8d3e650552051155ee44fa0
parent eeac1561c418135e8121d538a3ec20e58312fdca
author Eric Fischer <enf@google.com> 1318962846 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318962846 -0700

am eeac1561: (-s ours) am 17b5fece: (-s ours) Import revised translations.  DO NOT MERGE

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