tree b9221af250cffb377475a64263ff9a9a5f4379e1
parent f3755533722055806da43e06335128a7cf48b758
parent cd0f6e0cd5ab3271897064b28cecc50c0a481ca8
author Baligh Uddin <baligh@google.com> 1392411755 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411755 +0000

am cd0f6e0c: (-s ours) am 6fc0c669: (-s ours) am 33cd5b9e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit 'cd0f6e0cd5ab3271897064b28cecc50c0a481ca8':
  Import translations. DO NOT MERGE