tree 22baf7f91994cbf8c57fa6a75f6e683fe13fcbb8
parent 41ae403fa0b161c808849165cf4e238a9912ccff
parent d15068d15a2acdbcc25900f1684eb8b48a996627
author Geoff Mendal <mendal@google.com> 1416425787 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416425787 +0000

am d15068d1: (-s ours) am 328483aa: (-s ours) am 36d2656f: (-s ours) Import translations. DO NOT MERGE

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