tree 78054af8ffbf80fe7d2f777ce01d25a916e500f1
parent 42102629aaa2b41342999c242c93fe657da5c927
parent 0cee34f962d020226992018f3319d5553f6699e2
author Baligh Uddin <baligh@google.com> 1413816188 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413816188 +0000

am 0cee34f9: (-s ours) am 4a20d330: (-s ours) Import translations. DO NOT MERGE

* commit '0cee34f962d020226992018f3319d5553f6699e2':
  Import translations. DO NOT MERGE