tree 70f8bccc2e82531451b715038296b8aa553c75d1
parent b3f177b455b58f351b3c34432503fc77db1bac2d
parent f0bea657e9bc4abd0eee401d981cc4d339b41c1b
author Baligh Uddin <baligh@google.com> 1394729273 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394729273 +0000

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

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