tree 3c716ac0224738f1f014f8117cca6656121dda39
parent be0a85535568e3b9b4ad66d82229669e9f4307c0
parent 434770d5851f5fdc67c040e56e654f4f114693dc
author Geoff Mendal <mendal@google.com> 1439820956 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439820956 +0000

am 434770d5: (-s ours) am 5f5c4b23: (-s ours) am ea49b2f6: (-s ours) Import translations. DO NOT MERGE

* commit '434770d5851f5fdc67c040e56e654f4f114693dc':
  Import translations. DO NOT MERGE