tree ba826422983b739fb75285ffe93b26077a40c8c0
parent 0ab307238107189b4717127b638e6c7dc9f988f1
parent 51b66a98160f652467001360adfe5756bbb74069
author Baligh Uddin <baligh@google.com> 1408230265 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408230265 +0000

am 51b66a98: (-s ours) am 4808a434: (-s ours) Import translations. DO NOT MERGE

* commit '51b66a98160f652467001360adfe5756bbb74069':
  Import translations. DO NOT MERGE