tree 93f682e1889e9ec28b8502fc48b355c74b7b81af
parent 360c17a3a4340c484de5fdaed30c62d2c525db19
parent 812975599d8e33eb93addaa04e802854f38d3ff0
author Baligh Uddin <baligh@google.com> 1412624653 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412624653 +0000

am 81297559: (-s ours) am b1082705: (-s ours) am 7b906e4f: (-s ours) Import translations. DO NOT MERGE

* commit '812975599d8e33eb93addaa04e802854f38d3ff0':
  Import translations. DO NOT MERGE