tree 7501da73d6c325513cf56566749cb0dda39437da
parent a4cd63f6cc3a835ab268a9854f5ea8d7f41342c0
parent b4a027d07bdd6b488a0ca576f7369beb0cad17c6
author Geoff Mendal <mendal@google.com> 1444221695 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444221695 +0000

am b4a027d0: (-s ours) Import translations. DO NOT MERGE

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