tree 7005b87f3389e9e3f850e08af723755f012ae765
parent b4a367459a6e99f4740eea5816dac70967384803
parent 633ce45b0538cc2a941045be85ad742187a78c41
author Geoff Mendal <mendal@google.com> 1436824860 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436824860 +0000

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

* commit '633ce45b0538cc2a941045be85ad742187a78c41':
  Import translations. DO NOT MERGE