tree 3fd819340fe0e39c35c8b9698099ed3865d14a31
parent fccf17c2e83ed9d7befd416a158cc33e9985465c
parent 13cf3027963ff8c31332a964a97d72c8dd2c5510
author Baligh Uddin <baligh@google.com> 1443150980 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443150980 +0000

am 13cf3027: (-s ours) am d993ade7: (-s ours) Import translations. DO NOT MERGE

* commit '13cf3027963ff8c31332a964a97d72c8dd2c5510':
  Import translations. DO NOT MERGE