tree 6b4ffb16aca44a26f613e87bf5644eccc57eb9e8
parent ceaa1e39e44af1d65fa025902bd77a38f4bfdc39
parent 7c5bbe199df91c1003ebda95c1ee0190047f2af5
author Kenny Root <kroot@google.com> 1287244304 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287244304 -0700

am 7c5bbe19: (-s ours) am 0ac13db0: Merge "Import revised translations" into gingerbread

Merge commit '7c5bbe199df91c1003ebda95c1ee0190047f2af5'

* commit '7c5bbe199df91c1003ebda95c1ee0190047f2af5':
  Import revised translations