tree 372aa2b4d785acc4d7e54488d648037f98491fa9
parent 1c8b3778e1c380992a9ca96e965cdc4e6f3bca66
parent e35b3e380f42f450ce0116b8ef83edb7d68584ef
author Geoff Mendal <mendal@google.com> 1426510165 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426510165 +0000

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

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