tree 210189ffcc165ad72a40bb7a20a2326f13e863c8
parent 53dac3c9754630730ec91c2582258001f26c11cf
parent 589c0c2622d4279ba1926e4ff702ad8ea35ad324
author Geoff Mendal <mendal@google.com> 1436382405 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436382405 +0000

am 589c0c26: (-s ours) am 4356e281: (-s ours) Import translations. DO NOT MERGE

* commit '589c0c2622d4279ba1926e4ff702ad8ea35ad324':
  Import translations. DO NOT MERGE