tree 10da860fcff71886af91d082e31f0e1917926848
parent bec6f9162fec04459f6c6559b3e72b16480363da
parent 38941ad1a9cfe521e1e95a663d0013cb2f3805ae
author Baligh Uddin <baligh@google.com> 1414566338 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566338 +0000

am 38941ad1: (-s ours) am 16e56d75: (-s ours) am 588975f0: (-s ours) am 8eb857fa: (-s ours) am 458a15f7: (-s ours) am 89fbe00d: (-s ours) am 0491f0f1: (-s ours) Import translations. DO NOT MERGE

* commit '38941ad1a9cfe521e1e95a663d0013cb2f3805ae':