tree cba62d0d64153aa2169651696bc238591341d679
parent 784bbb1793821349bf77c3e4764967f822b54bdd
parent 9b4d5a425be9f641076f32da863b04e009de1922
author Baligh Uddin <baligh@google.com> 1414085552 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085552 +0000

am 9b4d5a42: (-s ours) am 65301b14: (-s ours) am 3d2fefae: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '9b4d5a425be9f641076f32da863b04e009de1922':