tree 5babd8338e5cd14b2492ab6013943919e004ae43
parent 9b11ea319b742d8fe480aa9e6582455c17d24843
parent 9f12946b87cc9acdfcedfdc7544b10d3c24bc77e
author Baligh Uddin <baligh@google.com> 1405970353 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405970353 +0000

am 9f12946b: (-s ours) am 2581f0ac: (-s ours) am 0f117c6a: (-s ours) Import translations. DO NOT MERGE

* commit '9f12946b87cc9acdfcedfdc7544b10d3c24bc77e':
  Import translations. DO NOT MERGE