tree f2d5ea082d5f96d46e9a5328074e85eedb7f4cd8
parent 6afe8df0b8af1a434931c77bb7d8ce865ec17b53
parent ff19acd73db88cbb51df9bc41c860b3ab50e7416
author Geoff Mendal <mendal@google.com> 1436803711 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436803711 +0000

am ff19acd7: (-s ours) am 05ffc726: (-s ours) am 913cd008: (-s ours) am fd7a7dc8: (-s ours) Import translations. DO NOT MERGE

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