tree c2854f9c72d274b559da4fa7dc09d7d534b3c17b
parent d8895488628755fadf5acbafb008cd69050412c8
parent 43e9ff21f6b14f208691f2bcafce566ac3202a7b
author Baligh Uddin <baligh@google.com> 1413758097 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413758097 +0000

am 43e9ff21: (-s ours) am 2b498330: (-s ours) am 19fac962: (-s ours) am 966b3500: (-s ours) Import translations. DO NOT MERGE

* commit '43e9ff21f6b14f208691f2bcafce566ac3202a7b':
  Import translations. DO NOT MERGE