tree 892f23b4391d546667d9af02d49965d979f05c7d
parent 6eda7ee170c1c03edc180472c316c07e7ac6ec8b
parent d0a1af42d0e27e3e3b47b6df6e06d45ee224d99f
author Baligh Uddin <baligh@google.com> 1380139543 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380139543 -0700

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

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