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

am 37b49b18: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly

* commit '37b49b18730b39677d068827377228616297116a':
  Import translations. DO NOT MERGE