tree 729100fd5958e6b210ef0589ad598a5d9797a9d9
parent 18d8897470c76fe8fdb9c63200e4504ba74ac68b
parent 6c0a5000f60a1ef6a8b47991c6ec4d7645cc1a3c
author Eric Fischer <enf@google.com> 1299099238 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299099238 -0800

am f6d1d87d: (-s ours) am 86b7a597: Import revised translations.  DO NOT MERGE

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