tree 87370aa6a2e69e8024fc6f3f46458e2bb878d9bb
parent b4a027d07bdd6b488a0ca576f7369beb0cad17c6
parent 3963b980bebacb58dd2ed57fd45b042a01f125a0
author Geoff Mendal <mendal@google.com> 1444222605 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444222605 +0000

am 3963b980: (-s ours) am 793b2a2d: (-s ours) am d4fd061d: (-s ours) Import translations. DO NOT MERGE

* commit '3963b980bebacb58dd2ed57fd45b042a01f125a0':
  Import translations. DO NOT MERGE