tree 7343c23e4db7b836edfa7135ef6b4b919ef893a6
parent 3fde60310766808a0a27c4d6cd46bff8876de447
parent 6a7d5dc43a3a5da5e8586e661b20817c89013545
author Eric Fischer <enf@google.com> 1296256698 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296256698 -0800

am 6a7d5dc4: (-s ours) am 955dcd21: Import revised translations.  DO NOT MERGE

* commit '6a7d5dc43a3a5da5e8586e661b20817c89013545':
  Import revised translations.  DO NOT MERGE