tree cba62d0d64153aa2169651696bc238591341d679
parent 7e4c40875dcb07f80bb418f391702bfa6f7738bd
parent 476e00451968fe0388e943e83d3895298031cd09
author Baligh Uddin <baligh@google.com> 1414085555 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085555 +0000

am 476e0045: (-s ours) am 7c4a9e55: (-s ours) am 37749ea3: (-s ours) Import translations. DO NOT MERGE

* commit '476e00451968fe0388e943e83d3895298031cd09':