tree 298dcebf229b7d3a5284aee574a144ca11b4a4f0
parent 5e326073e95fa10526a70f0f088db7ab491c26bb
parent b2df3e40d5bb08295ebb9ee72bd601d88545cc2c
author Baligh Uddin <baligh@google.com> 1408161638 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408161638 +0000

am b2df3e40: (-s ours) am 97ffe946: (-s ours) Import translations. DO NOT MERGE

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