tree 8b2c2b135bab9ef84ee4377434f6c686976dc87c
parent a5ed815d6b5cb31c6b809eadc1b5a91f578c988b
parent 2d16e4e7a00acfba66f0755fbd8088f7045f9df6
author Eric Fischer <enf@google.com> 1337979594 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337979594 -0700

am 2d16e4e7: Import translations. DO NOT MERGE

* commit '2d16e4e7a00acfba66f0755fbd8088f7045f9df6':
  Import translations. DO NOT MERGE