tree 2f869dd7c867c13a6c030b8885529097ee4705bd
parent ed35d38b714c55c0de1dffbe8e457e764efdd45a
parent ae0432fec3d9d614e8cdbf3d1b4187fdd7411f87
author Eric Fischer <enf@google.com> 1317254566 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317254566 -0700

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

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