tree 8b2c2b135bab9ef84ee4377434f6c686976dc87c
parent d84f9df0432b8daa0602bfb43ad389d795d0f488
parent 425f92b5c168cd91536600051decf31fb34baf2d
author Eric Fischer <enf@google.com> 1337979782 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337979782 -0700

am 425f92b5: (-s ours) am 2d16e4e7: Import translations. DO NOT MERGE

* commit '425f92b5c168cd91536600051decf31fb34baf2d':
  Import translations. DO NOT MERGE