tree 2847949f8bc9111a84704c12bd64ebc1ee2ced97
parent 0c0324004410f8cef7caeb6e8c51b18bf146f700
parent 9b4d5a425be9f641076f32da863b04e009de1922
author Baligh Uddin <baligh@google.com> 1392411760 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411760 +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':
  Import translations. DO NOT MERGE