tree 95ba60810aca0115e029fbfc8ee16b69daa14b61
parent cf268e94438797e0a816a94d96808c4140d1558f
parent a9a886b849077f9e61c0daac8c40e05825455eee
author Eric Fischer <enf@google.com> 1308241901 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308241901 -0700

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

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