tree a30c4f1ac8f2bbe7db9cdc7853307082cf2e69b0
parent ec234355575c8472ec000138320f7d042f5283a8
parent ec5371e4a7398bd872c536f828aa1f157e082741
author Geoff Mendal <mendal@google.com> 1438447547 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438447547 +0000

am ec5371e4: (-s ours) am 480c600d: (-s ours) am 97e3b5fc: (-s ours) Import translations. DO NOT MERGE

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