tree 31ef12a6bd9ef36e143d1c9f30877fae03d71c79
parent bfca8281f590e2e7354709282f53846995662ea8
parent b9925c43d7e8e38d21f9326217c10e4e67275f86
author Geoff Mendal <mendal@google.com> 1413206752 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413206752 +0000

am b9925c43: (-s ours) am c4868dea: (-s ours) Import translations. DO NOT MERGE

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