tree d428a30de422d85c95750eeb05777d80cb88495f
parent 7cb0fc588042f7642f13ea2cc404eae04bd5509a
parent 605f402796afa9c88e2f91284e98d1f59a0726aa
author Eric Fischer <enf@google.com> 1281466812 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281466812 -0700

am 605f4027: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

Merge commit '605f402796afa9c88e2f91284e98d1f59a0726aa' into gingerbread-plus-aosp

* commit '605f402796afa9c88e2f91284e98d1f59a0726aa':
  Import revised translations.  DO NOT MERGE