tree 74e5954e8cada3449992fde6f86a2680c1623337
parent bb8c104317a8f12e34ef068c513a8f9a559830ed
parent baf687ffca19cc2be420f8d3e84f151adc225dc1
author Geoff Mendal <mendal@google.com> 1436977972 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436977972 +0000

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

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