tree b91ce25e110d6212cb7789c8a49660932d69369f
parent 0c52af7a3e137f131dcec1c45589291296911a87
parent 9c105b9f0aa252eec19aeb8205eaf0a751994354
author Baligh Uddin <baligh@google.com> 1387486590 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387486590 +0000

am 9c105b9f: (-s ours) am b9267035: (-s ours) am 359e9a5c: (-s ours) am 092278c8: (-s ours) Import translations. DO NOT MERGE

* commit '9c105b9f0aa252eec19aeb8205eaf0a751994354':
  Import translations. DO NOT MERGE