tree fc863d7c20a49306aa6763046e9b74c5a7edce64
parent 75493179cc0aefce04912c679fb9c81cdd2717a6
parent 56f149915447452ab4cadf8d07eb8f698cca1905
author Baligh Uddin <baligh@google.com> 1396923848 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396923848 +0000

am 56f14991: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-nova

* commit '56f149915447452ab4cadf8d07eb8f698cca1905':
  Import translations. DO NOT MERGE