tree b648d40deac5c8b6a18e70c5f9e899f8169b440b
parent 24c79cbef7a72b6e94ef38a75bbd0fefa216c273
parent ead2d8c48c5bbb861879923170c5a54eacfdd3a8
author Eric Fischer <enf@google.com> 1316215447 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316215447 -0700

am ead2d8c4: (-s ours) Import revised translations.  DO NOT MERGE

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