tree da4cb3189fa0cbd950009d9587b8bfe911f84d6e
parent 8558c4030f12e48f407154fd490e55571c3702c4
parent b879135b9b4b0ba5f2496effe80b3f04f83740e5
author Eric Fischer <enf@google.com> 1300492447 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300492447 -0700

am b879135b: (-s ours) am 9d8285fa: Import revised translations.  DO NOT MERGE

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