tree bf4d009126184e4ada863324672893b844f1eb85
parent 382feb11b767600d6aed8ad97d08d9de7a8673e0
parent 8c93a140f61d2880163dcc7dc99fa177aa4f0b2b
author Eric Fischer <enf@google.com> 1340137541 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340137541 -0700

am 8c93a140: Import translations. DO NOT MERGE

* commit '8c93a140f61d2880163dcc7dc99fa177aa4f0b2b':
  Import translations. DO NOT MERGE