tree 0c898c48c83a453f74ac94b509f51b2a18737f70
parent 223df831eca3c0ff175df186f549566198d2d1f9
parent d4de959b1be960cc4b7ab87056750a3d5e77dad3
author Geoff Mendal <mendal@google.com> 1433948051 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433948051 +0000

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

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