tree 0dd59ba884308f808ef4b74a20b0bfa89cecf55c
parent 1905d8f34ee317da788244f2dde3e8b75c25c072
parent 81c93829582aac6cd8717511216611f37cc9c4c5
author Geoff Mendal <mendal@google.com> 1431350850 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431350850 +0000

am 81c93829: (-s ours) Import translations. DO NOT MERGE

* commit '81c93829582aac6cd8717511216611f37cc9c4c5':
  Import translations. DO NOT MERGE