tree 2357ce945f5063ba8628ab511a79b6c36ff0ab6f
parent 3485e12d33c3598ec959ed3e7126ea55c35a0b59
parent fa89200826a6566fad9ca6accefb6fa14c2e0ed9
author Eric Fischer <enf@google.com> 1322602358 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322602358 -0800

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

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