tree 3b0055ff243be8134fe431012afcd13838fd2827
parent 8cf3d1b640dc51067682d39406e60cc768bffb5b
parent 170ca1ccd81a1a73bec94fa468a8b54d7d25717b
author Geoff Mendal <mendal@google.com> 1434598857 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434598857 +0000

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

* commit '170ca1ccd81a1a73bec94fa468a8b54d7d25717b':
  Import translations. DO NOT MERGE