tree e6452de28df36c76c0d09bf9c05cc44fb430f238
parent 83ec7737bd1e50fb3b735f98cd140764f3eca97b
parent 5b2bbb7485365a76d23df36c82f03ae99ab1f74a
author Eric Fischer <enf@google.com> 1319135531 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319135531 -0700

am 5b2bbb74: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

* commit '5b2bbb7485365a76d23df36c82f03ae99ab1f74a':
  Import revised translations.  DO NOT MERGE