tree e1d01c383a2a4fc026b2d85c8582cd8faa5acc8e
parent 80b9bd854365bf052db9572bcff0fedf74090ff5
parent 63069cc985869fe06254e352ea63b361cb0d0917
author Geoff Mendal <mendal@google.com> 1425478083 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425478083 +0000

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

* commit '63069cc985869fe06254e352ea63b361cb0d0917':
  Import translations. DO NOT MERGE