tree c66e55bed8c74d5faef3e5ba7e137689d9202667
parent 40e66bce6ceea1b2b9d49a26564665222eb32745
parent 713e794dac88e4e977faa95da88163db6a568e15
author Geoff Mendal <mendal@google.com> 1423498030 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423498030 +0000

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

* commit '713e794dac88e4e977faa95da88163db6a568e15':
  Import translations. DO NOT MERGE