tree 4905e9ee8902a3217c52df35e320c0ef590d0e63
parent 2231b4840e066b2c021af7400340e00b72c9a055
parent 17b5fecebaa3b54d0cd818f61ac993af8fe8926b
author Eric Fischer <enf@google.com> 1318962675 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318962675 -0700

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

* commit '17b5fecebaa3b54d0cd818f61ac993af8fe8926b':
  Import revised translations.  DO NOT MERGE