tree 2c54ac44fa22f87a874e93ed17d385fa850c9212
parent ad8535ee889d92348da3faa63dcd5ea097952dd9
parent c82b1824cb6a9a809818155059c1daf275ac94f1
author Eric Fischer <enf@google.com> 1328897305 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897305 -0800

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

* commit 'c82b1824cb6a9a809818155059c1daf275ac94f1':
  Import translations. DO NOT MERGE