tree 3f4fc6f6c664270d84652a917babf80ff20cb6a4
parent 1cce13fd7f6b6e7f0ba19de421d7d97e79fba771
parent b7104dd0a403dcf88be1b72486e200070dc1b5ce
author Baligh Uddin <baligh@google.com> 1398219290 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398219290 +0000

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

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