tree 85c1e9ba5adc3bcf8632ae7728575590bb3aef9f
parent 2dfdf013415677f655ff4e4669f87f6477d48035
parent 8a73e2b2210a77c432e6e8241f3a6eb700a594cb
author Baligh Uddin <baligh@google.com> 1366667058 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366667058 -0700

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

* commit '8a73e2b2210a77c432e6e8241f3a6eb700a594cb':
  Import translations. DO NOT MERGE