tree 5d8dfae125cedfc4cbf96212b35960288a0a04f6
parent 089ad49fdd22f9fd3595fb4725298e7674c31a94
parent 2d1654b054eae4f08831f1c753c9ccc66a585980
author Eric Fischer <enf@google.com> 1323471832 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323471832 -0800

am 2d1654b0: am 692999a4: (-s ours) am f4e80c84: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit '2d1654b054eae4f08831f1c753c9ccc66a585980':
  Import revised translations. DO NOT MERGE