tree 28074b5ac05e56d80c71b69d15ecb13593c63670
parent 7b43f3a2cbabdf9e23f27e5b77fa18d6911e4478
parent b77346add048f7aa776ecf55400a711598fc8aa9
author Geoff Mendal <mendal@google.com> 1425306289 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425306289 +0000

am b77346ad: (-s ours) am 6b5b052e: (-s ours) Import translations. DO NOT MERGE

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