tree b48e44e889ea100dde938054152aa41027c8fbd2
parent 3f07183ac1a8a8fe995d32816abf14167ff22cf8
parent d82f26fde87e3d8ad5246d536100886fc34f4db3
author Geoff Mendal <mendal@google.com> 1436981691 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436981691 +0000

am d82f26fd: (-s ours) am c84ce200: (-s ours) am dcb985ea: (-s ours) Import translations. DO NOT MERGE

* commit 'd82f26fde87e3d8ad5246d536100886fc34f4db3':
  Import translations. DO NOT MERGE