tree 2d4ff6c5c3e23fb7dae3a5f658f12551c0ac1b87
parent 1a8bc569d5f38ddcadef6f7be689e2c4c10f55aa
parent e8fe295079fe5448a8b6086c3bfb80043b9e3ac0
author Geoff Mendal <mendal@google.com> 1436979207 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436979207 +0000

am e8fe2950: (-s ours) am 944ee8a7: (-s ours) am f5766c04: (-s ours) Import translations. DO NOT MERGE

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