tree 210189ffcc165ad72a40bb7a20a2326f13e863c8
parent 87c43346eb71ce5f3cd6d51dc6ed44652a425b71
parent 987922d81e2948707b23af8dd7608e0a710c6b46
author Geoff Mendal <mendal@google.com> 1436383143 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436383143 +0000

am 987922d8: (-s ours) am 9e218eaf: (-s ours) Import translations. DO NOT MERGE

* commit '987922d81e2948707b23af8dd7608e0a710c6b46':
  Import translations. DO NOT MERGE