tree 5d8dfae125cedfc4cbf96212b35960288a0a04f6
parent d9e771db74ea09560132d5937433bbf1006b389a
parent 692999a463aca8730fd5949448449dbe4d4403e9
author Eric Fischer <enf@google.com> 1323471494 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323471494 -0800

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

* commit '692999a463aca8730fd5949448449dbe4d4403e9':
  Import revised translations. DO NOT MERGE