tree beb51d6b3d1a27774590d479b6af424bf2532a30
parent 9e73f7c74b307ab7f88ac19e8de2f53bf2475b1e
parent b4961be5f01bf773f5b4fac24133a8a06123c018
author Eric Fischer <enf@google.com> 1256872808 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256872808 -0700

am b4961be5: (-s ours) am 11469444: am 4d7b6c94: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'b4961be5f01bf773f5b4fac24133a8a06123c018'

* commit 'b4961be5f01bf773f5b4fac24133a8a06123c018':
  Import revised translations.  DO NOT MERGE