tree 5ede539254d83d7a670fe5aa1a26745d66bf724f
parent c9711790d8e21ea20d1da09dca267ddbb6acde62
parent a09130b307796a7c2428cb3e2a250c0028ce51c8
author Geoff Mendal <mendal@google.com> 1439387955 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439387955 +0000

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

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