tree 96831dd882c0307bc0a3b4c3ed9abdbe7334e7f7
parent 29d9d6b63209d273a109315b9e31a675151d4333
parent a6f881b346292c2653f266e224bfd556af5b74cb
author Baligh Uddin <baligh@google.com> 1400089727 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400089727 +0000

am 7dbdcfa5: (-s ours) am 5c3e4ede: (-s ours) am 527822fc: (-s ours) am 4cf594f6: (-s ours) am b5f89802: (-s ours) am 4740067a: (-s ours) am 06cc7f7f: (-s ours) Import translations. DO NOT MERGE

* commit '7dbdcfa525ff68fce14b37ce5aa987c3aec8423f':