tree a3ae520a31e0160f90fd865f77d7b01905e50164
parent 6ecd8e883f6b25f5f1b7799fa6c75551e5788d61
parent 0f260324a9cee5122d67096c1cd281979d21b712
author Baligh Uddin <baligh@google.com> 1398350597 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398350597 +0000

am 0f260324: (-s ours) am 839ab5f2: (-s ours) Import translations. DO NOT MERGE

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