tree 341b25f53ce8db5f06ec2fc6f07436707eabf79b
parent 1cefae9ba358610987f3dc8686ef00f5eb85d372
parent 91baff4826343738eb06229a330d269e8704cc45
author Baligh Uddin <baligh@google.com> 1414388304 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414388304 +0000

am 91baff48: (-s ours) am a2edad16: (-s ours) am 796e3c3f: (-s ours) Import translations. DO NOT MERGE

* commit '91baff4826343738eb06229a330d269e8704cc45':