tree d5c447d667d474069e712b874f60718134b7d7ef
parent 3396a11e354fe4d6243749579c976b341d1007a0
parent 469fa946132b34165ea014e2eef7cd94f59171c1
author Geoff Mendal <mendal@google.com> 1440888277 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440888277 +0000

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

* commit '469fa946132b34165ea014e2eef7cd94f59171c1':
  Import translations. DO NOT MERGE