tree a158d904c3dda4ac493d32baf304fdcc0f1dc991
parent 1b411d910f3fcd9f9c9cdb804fa0741476020448
parent 56aded53dd75631bc7a3f0c5ccb33368fe49dc22
author Eric Fischer <enf@google.com> 1328897725 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897725 -0800

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

* commit '56aded53dd75631bc7a3f0c5ccb33368fe49dc22':
  Import translations. DO NOT MERGE