tree 87f64f088d23e423371f5190548b2a0522713c2b
parent 3cae91d701bade99379b0b681ed16ec736603253
parent 4b52bfbbfa39092ca4299f7f29eaa08be359ac91
author Geoff Mendal <mendal@google.com> 1426957696 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426957696 +0000

am 4b52bfbb: (-s ours) am d20acfeb: (-s ours) Import translations. DO NOT MERGE

* commit '4b52bfbbfa39092ca4299f7f29eaa08be359ac91':
  Import translations. DO NOT MERGE