tree c688ac2063b1f3920885b812acc3951359d8fa50
parent c2e809597a5b902437432c07f867d9bb4013e797
parent e95ca561c515f927caae4b4de27aa73cad789b07
author Baligh Uddin <baligh@google.com> 1404682563 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404682563 +0000

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

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