tree b443ad9aa983029bf388f2e50ed20f3edb3a4969
parent 8ccffb8253df55a6561e64c6bc6eb3dff5b49066
parent fc4e38ec06730b73cb384ab92f197aa15ff886e8
author Baligh Uddin <baligh@google.com> 1411414732 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411414732 +0000

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

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