tree 98fc8c9e9cbe1710b313eb29572ee7f25fea2f89
parent baa9448c9d759848cd9e5f268ca48d011c0df23e
parent f3c2102ca46a186685afceb7cfc4974d7d2722fc
author Baligh Uddin <baligh@google.com> 1411321922 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411321922 +0000

am f3c2102c: (-s ours) Import translations. DO NOT MERGE

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