tree 5e897eb2fbf0d8bd8f17efc5b47d1267e95a03ac
parent 1fcae0893855e378183d34ef48cef4162995acfd
parent 59838e93486f87da9bd06412ba5a639cfaf73a8c
author Baligh Uddin <baligh@google.com> 1383686818 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383686818 -0800

am 4934f7cf: (-s ours) am c394aec2: (-s ours) Import translations. DO NOT MERGE

* commit '4934f7cfd5a2d48b898265081d5d18bf92579b39':
  Import translations. DO NOT MERGE