tree 98eb64568f569764e3290b623957e5222a0e6fe6
parent 6c7a985c55f5908ecf225ff944f635f34c902310
parent 645ff3abe520e349f5ff6188b732ce46fcd7012f
author Eric Fischer <enf@google.com> 1298661993 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298661993 -0800

am 645ff3ab: (-s ours) am 92b68426: Import revised translations.  DO NOT MERGE

* commit '645ff3abe520e349f5ff6188b732ce46fcd7012f':
  Import revised translations.  DO NOT MERGE