tree 971a9d0b4a32dcaffb15ea680e1ebf52cce7a85c
parent d847b271a5cfc177d7649877c54b4ddaa5073e01
parent 2bfc2e0e899cf1359666e91a1ba6216e958b8018
author Eric Fischer <enf@google.com> 1296535157 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296535157 -0800

am 2bfc2e0e: (-s ours) am c85e2c63: Import revised translations.  DO NOT MERGE.  Bug 3394542

* commit '2bfc2e0e899cf1359666e91a1ba6216e958b8018':
  Import revised translations.  DO NOT MERGE.  Bug 3394542