tree 74776909b1b02090f951993562dd7722d490094a
parent 862d72e2f4e600d6188f5a21a906d5374ab4f123
parent c95236deadfed31966661c7ed5c5db7422b3d0dc
author Geoff Mendal <mendal@google.com> 1415027270 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415027270 +0000

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

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