tree cea01717f39100b64a79adebd56eb535d000735f
parent 4e0ab2e709edc3701e2fbfcfcc244f8b3d3a77c2
parent dac298c2c8bb0f293ca4be4289f08d47440dd617
author Eric Fischer <enf@google.com> 1298575650 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298575650 -0800

am dac298c2: (-s ours) am 7df52a91: Import revised translations.  DO NOT MERGE

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