tree b5166242e6ede5e678a3b0f1a39360ce31455468
parent 8484a8bf31cace41f6ee411dc077f12416c65a01
parent 10ba83e40728fc76a35bf7d6b1a2dae3150bf98d
author Eric Fischer <enf@google.com> 1319238359 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319238359 -0700

am 10ba83e4: (-s ours) am f060868d: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

* commit '10ba83e40728fc76a35bf7d6b1a2dae3150bf98d':
  Import revised translations.  DO NOT MERGE