tree 97b6f46a856f9a50a1e9b6839d0a0a458a6d7a93
parent b3586d3ace6ec8a2f5c33e1d66d2441152a9eed4
parent 10057cd73da76de397c0e0b2e40f8ef8acb44a0c
author Geoff Mendal <mendal@google.com> 1415063585 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415063585 +0000

am 3e717881: (-s ours) am 27ce996c: (-s ours) Import translations. DO NOT MERGE

* commit '3e7178819589a44b6d8a190d4468d4604bf5895a':
  Import translations. DO NOT MERGE