tree e582ef3e2e39f8bbb5d8353862766514dbaf8975
parent 0b492138c744299e695b6aeee24eebb880de1c7d
parent 7a4adedf0aa9560578a7cd4b5db8b18ea2f46c4d
author Geoff Mendal <mendal@google.com> 1385404627 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385404627 -0800

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

* commit '7a4adedf0aa9560578a7cd4b5db8b18ea2f46c4d':
  Import translations. DO NOT MERGE