tree 10da860fcff71886af91d082e31f0e1917926848
parent cabf71183e9ba65f08ffc681f5ec5a18dd9001dd
parent 725648ecd0366c740f205efd3664daba1d5d0f98
author Baligh Uddin <baligh@google.com> 1414566335 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566335 +0000

am 725648ec: (-s ours) am f3804c18: (-s ours) am 1b2ee8c1: (-s ours) am 286ecf1e: (-s ours) Import translations. DO NOT MERGE

* commit '725648ecd0366c740f205efd3664daba1d5d0f98':