tree 82aa4b816e1e92f3199e438728c6864998646dec
parent 0a0f15bfb3a1710b024be7be18fac4cacb9cab0e
parent 1dd4a81c6fe870b592fc92e0d6cf5dda137c6528
author Eric Fischer <enf@google.com> 1300320847 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300320847 -0700

am 8504423f: (-s ours) am c657fcce: am 20ccaf6c: Import revised translations.  DO NOT MERGE

* commit '8504423f00237e13e87499f74e41ecf73c3e8e1b':
  Import revised translations.  DO NOT MERGE