tree 8e893745171617261ab34cd6af21fadee53f0d93
parent a0b62ece8383d8fae96287cc333e2165e29d21e0
parent b4251873b0ff784d7f7c925da84ce7b862a87412
author Baligh Uddin <baligh@google.com> 1367365801 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367365801 -0700

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

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