tree 7cfc9a621caf07d964a214f5240e43b6aa53a143
parent fbb7647adcaba9fa7183f4b26e497f82760f5f13
parent ba92c63c47b46a631d93c59afe8a7967683fce11
author Geoff Mendal <mendal@google.com> 1418067806 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418067806 +0000

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

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