tree 042936a8fd97cd49931a9128a29a9a8c635ff619
parent 5974932dae85b553dc7b1598221037f502361fff
parent 6c53e555e9358ea41aec28d8098623a35f24e32f
author Eric Fischer <enf@google.com> 1320698607 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320698607 +0000

am 6c53e555: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '6c53e555e9358ea41aec28d8098623a35f24e32f':
  Import revised translations.  DO NOT MERGE