tree 6c73eda091ad589be02aa9477b5fcb0042ea7b22
parent eb550f1a30c51a46835ea19c9247b291febc8a2f
parent 0f85529f89b094518057e07e74acdd66972fe03e
author Geoff Mendal <mendal@google.com> 1437405651 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437405651 +0000

am 0f85529f: (-s ours) am 4cd88420: (-s ours) am 692f3a96: (-s ours) am 61f048a4: (-s ours) Import translations. DO NOT MERGE

* commit '0f85529f89b094518057e07e74acdd66972fe03e':
  Import translations. DO NOT MERGE