tree e2d754e7d5b3464db300723ab6594ef0430753c9
parent 8791b79d48feaabbf451d86b1b7c3f414258c304
parent df6781817f51ba7cfe97825db79578a858775c0a
author Eric Fischer <enf@google.com> 1336075137 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336075137 -0700

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

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